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

[lilypond.git] / lily / include / context.hh

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 150996c4e41694ca8ee073ea9a3346aa6d5a61b0..dc13314277be9541b4f9ceac41084edbc00b7cf5 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--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
@@ -32,12 +32,12 @@ class Context : public Smob<Context>
 {
 public:
   SCM mark_smob ();
-  static int print_smob (SCM, SCM, scm_print_state *);
+  int print_smob (SCM, scm_print_state *);
   static const char type_p_name_[];
   virtual ~Context ();
 private:
   Scheme_hash_table *properties_dict () const;
-  Context (Context const &src);
+  Context (Context const &src); // Do not define!  Not copyable!
 
   DECLARE_CLASSNAME (Context);
   void terminate ();