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

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

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index beca941da7d000f7c956d2118098ca7ebd8480b4..9530c94b7076fb5a9137253adbcd8732a6900836 100644 (file)
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2014  Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2004--2015  Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,9 +30,8 @@
 class Paper_book : public Smob<Paper_book>
 {
 public:
-  static int print_smob (SCM, SCM, scm_print_state *);
-  static SCM mark_smob (SCM);
-  static const char type_p_name_[];
+  SCM mark_smob () const;
+  static const char * const type_p_name_;
   virtual ~Paper_book ();
 private:
   SCM systems_;