Merge remote branch 'origin/release/unstable' into HEAD

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

diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index 05933d49f39ca8e20f1a506301131899a4a63e74..3d4d5840e1f075481c8d20b060353c7bfca9f633 100644 (file)
--- a/lily/include/paper-score.hh
+++ b/lily/include/paper-score.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--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
@@ -39,8 +39,6 @@ public:
 
   DECLARE_CLASSNAME (Paper_score);
 
-  static Paper_score *unsmob (SCM);
-
   Output_def *layout () const;
   System *root_system () const;
 
@@ -56,7 +54,7 @@ protected:
   virtual void derived_mark () const;
 
 private:
-  Paper_score (Paper_score const &);
+  Paper_score (Paper_score const &); // Do not define!  Not copyable!
 };
 
 #endif /* PAPER_SCORE_HH */