*** empty log message ***

[lilypond.git] / lily / beam-engraver.cc

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 39ee8c6f3db538ef6e386fef25e697a68a49e516..e8a77ec1ffb8514ba77c149dcf5700fe1bed943d 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -6,18 +6,19 @@
   (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "engraver.hh"
 #include "beam.hh"
-#include "stem.hh"
-#include "warn.hh"
 #include "beaming.hh"
-#include "score-engraver.hh"
-#include "rest.hh"
+#include "context.hh"
 #include "drul-array.hh"
+#include "duration.hh"
+#include "engraver.hh"
+#include "international.hh"
 #include "item.hh"
+#include "rest.hh"
+#include "score-engraver.hh"
 #include "spanner.hh"
-#include "context.hh"
-#include "duration.hh"
+#include "stem.hh"
+#include "warn.hh"
 
 #include "translator.icc"
 
@@ -242,7 +243,7 @@ Beam_engraver::acknowledge_stem (Grob_info info)
   Music *m = info.ultimate_music_cause ();
   if (!m->is_mus_type ("rhythmic-event"))
     {
-      String s = _ ("stem must have Rhythmic structure");
+      std::string s = _ ("stem must have Rhythmic structure");
       if (info.music_cause ())
        info.music_cause ()->origin ()->warning (s);
       else