*** empty log message ***

[lilypond.git] / lily / part-combine-iterator.cc

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index 9d2a520f7c0e0fbf6bec90547d3b3daf8d4a17a5..c2625f28c1cf43d3ff1972d8a7583d1a46aefb4f 100644 (file)
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -410,8 +410,8 @@ Part_combine_iterator::process (Moment m)
        solo2 ();
       else if (scm_is_symbol (tag))
        {
-         String s = "Unknown split directive: "
-           + (scm_is_symbol (tag) ? ly_symbol2string (tag) : String ("not a symbol"));
+         std::string s = "Unknown split directive: "
+           + (scm_is_symbol (tag) ? ly_symbol2string (tag) : std::string ("not a symbol"));
          programming_error (s);
        }
     }