Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / paper-outputter.cc

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index aff76981f7c42b41ceb29b696ba9ad3651a0e5b8..e7e48c2fb3c0c9ae03b34269567817027e4d3bd8 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -17,7 +17,7 @@ using namespace std;
 #include "dimensions.hh"
 #include "file-name.hh"
 #include "font-metric.hh"
-#include "input-smob.hh"
+#include "input.hh"
 #include "lily-version.hh"
 #include "main.hh"
 #include "output-def.hh"
@@ -29,13 +29,13 @@ using namespace std;
 
 #include "ly-smobs.icc"
 
-Paper_outputter::Paper_outputter (SCM port, std::string format)
+Paper_outputter::Paper_outputter (SCM port, string format)
 {
   file_ = port;
   output_module_ = SCM_EOL;
   smobify_self ();
 
-  std::string module_name = "scm output-" + format;
+  string module_name = "scm output-" + format;
   output_module_ = scm_c_resolve_module (module_name.c_str ());
 }