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

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

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 1a9c0c256730133045bd3a7573dbd0127f8d523a..8eba283027a8811e6bfa04b7396fe5b11c749d81 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -10,7 +10,6 @@
 #define CONTEXT_HH
 
 #include "context-key-manager.hh"
-#include "lily-proto.hh"
 #include "listener.hh"
 #include "moment.hh"
 #include "std-vector.hh"
@@ -21,7 +20,7 @@ class Context
   Scheme_hash_table *properties_dict () const;
   Context (Context const &src);
 
-  DECLARE_SMOBS (Context, dummy);
+  DECLARE_SMOBS (Context);
   DECLARE_CLASSNAME(Context);
   void terminate ();
 
@@ -87,10 +86,15 @@ public:
   /* properties:  */
   SCM internal_get_property (SCM name_sym) const;
   SCM properties_as_alist () const;
-  void internal_set_property (SCM var_sym, SCM value);
   Context *where_defined (SCM name_sym, SCM *value) const;
   void unset_property (SCM var_sym);
 
+#ifndef NDEBUG
+  void internal_set_property (SCM var_sym, SCM value, char const *file, int line, char const *fun);
+#else
+  void internal_set_property (SCM var_sym, SCM value);
+#endif
+
   Context *create_context (Context_def *, string, SCM);
   DECLARE_LISTENER (create_context_from_event);
   DECLARE_LISTENER (acknowledge_infant);
@@ -112,7 +116,6 @@ public:
   void add_context (Context *trans);
   bool is_bottom_context () const;
   bool is_removable () const;
-  bool try_music (Music *);
 
   Context *find_create_context (SCM context_name,
                                string id, SCM ops);