Merge branch 'master' into accepts

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

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 31b7baf19fedf4defcc43f84662959dc64802fc4..648a52ae3b7f089a2f9d6248ca1c1507f7660464 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -85,6 +85,7 @@ public:
   Context *where_defined (SCM name_sym, SCM *value) const;
   void unset_property (SCM var_sym);
 
+  void instrumented_set_property (SCM, SCM, const char*, int, const char*);
   void internal_set_property (SCM var_sym, SCM value);
 
   Context *create_context (Context_def *, string, SCM);
@@ -113,8 +114,7 @@ public:
                                string id, SCM ops);
   Context *create_unique_context (SCM context_name, string context_id,
                                  SCM ops);
-  vector<Context*> path_to_acceptable_context (SCM alias,
-                                                 Output_def *) const;
+  vector<Context_def*> path_to_acceptable_context (SCM alias) const;
 };
 
 /*