Merge branch 'master' into translation

[lilypond.git] / lily / include / output-def.hh

diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh
index e41cf75846ae39b4327c0c0ad9826abbb13c3ebf..5de672e67addf202f1609017da8d0d838272bb81 100644 (file)
--- a/lily/include/output-def.hh
+++ b/lily/include/output-def.hh
@@ -66,7 +66,7 @@ public:
   /*
     variables.
    */
-  SCM c_variable (const std::string &id) const;
+  SCM c_variable (const string &id) const;
   SCM lookup_variable (SCM sym) const;
   void set_variable (SCM sym, SCM val);
   void normalize ();