Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / include / paper-outputter.hh

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index 33a5f0ec406cc8c5e22ba00cf2cfd7925bdf6ead..cd1a5e2c92fb4ffb34a0581f85398750c1276d28 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -37,11 +37,11 @@ public:
   virtual ~Paper_outputter ();
 private:
   SCM output_module_;
-  std::string file_name_;
+  string file_name_;
   SCM file_;
 
 public:
-  Paper_outputter (SCM port, const std::string &format);
+  Paper_outputter (SCM port, const string &format);
 
   void close ();
   SCM dump_string (SCM);