*** empty log message ***

[lilypond.git] / lily / grob-interface.cc

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 8a990cfb43b6f5ec1632e18ba2eb1e4804edcab0..779f54377b2502186cf002df706be86560413042 100644 (file)
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -8,8 +8,10 @@
 
 #include "grob-interface.hh"
 
-#include "protected-scm.hh"
 #include "grob.hh"
+#include "international.hh"
+#include "protected-scm.hh"
+#include "std-string.hh"
 #include "warn.hh"
 
 void add_interface (char const *symbol,
@@ -43,7 +45,7 @@ check_interfaces_for_property (Grob const *me, SCM sym)
       SCM iface = scm_hashq_ref (all_ifaces, scm_car (ifs), SCM_BOOL_F);
       if (iface == SCM_BOOL_F)
        {
-         String msg = to_string (_f ("Unknown interface `%s'",
+         std::string msg = to_string (_f ("Unknown interface `%s'",
                                      ly_symbol2string (scm_car (ifs)).c_str ()));
          programming_error (msg);
          continue;
@@ -54,7 +56,7 @@ check_interfaces_for_property (Grob const *me, SCM sym)
 
   if (!found)
     {
-      String str = to_string (_f ("Grob `%s' has no interface for property `%s'",
+      std::string str = to_string (_f ("Grob `%s' has no interface for property `%s'",
                                  me->name ().c_str (),
                                  ly_symbol2string (sym).c_str ()));
       programming_error (str);