Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / context-def.cc

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 8b28c5cde89f30baaa6a5f7a2ac65fb71c9498eb..f4023a09a110833cb56ad13f83d8c2dbf75a4059 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -87,7 +87,7 @@ Context_def::print_smob (SCM smob, SCM port, scm_print_state*)
 SCM
 Context_def::mark_smob (SCM smob)
 {
-  ASSERT_LIVE_IS_ALLOWED();
+  ASSERT_LIVE_IS_ALLOWED ();
   
   Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob);
 
@@ -261,9 +261,9 @@ Context_def::get_translator_names (SCM user_mod) const
 }
 
 Context *
-Context_def::instantiate (SCM ops, Object_key const *key)
+Context_def::instantiate (SCM ops)
 {
-  Context *context = new Context (key);
+  Context *context = new Context ();
 
   context->definition_ = self_scm ();
   context->definition_mods_ = ops;