input/regression/bookparts.ly fails at PDF conversion stage

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

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index a156c382d9348b056320d2a9015af59eac9ba48d..33a5f0ec406cc8c5e22ba00cf2cfd7925bdf6ead 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -33,16 +33,15 @@
 class Paper_outputter : public Smob<Paper_outputter>
 {
 public:
-  static int print_smob (SCM, SCM, scm_print_state *);
-  static SCM mark_smob (SCM);
+  SCM mark_smob () const;
   virtual ~Paper_outputter ();
 private:
   SCM output_module_;
-  string file_name_;
+  std::string file_name_;
   SCM file_;
 
 public:
-  Paper_outputter (SCM port, const string &format);
+  Paper_outputter (SCM port, const std::string &format);
 
   void close ();
   SCM dump_string (SCM);