Issue 5053/2: Fix extendersOverRests property

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

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 7e391740a6d2f4327df101a85f6b4df513e2c76f..5768ee5471989f94d42dc87fc13f6c1737e2489e 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -82,10 +82,10 @@ Context_def::~Context_def ()
 {
 }
 
-const char Context_def::type_p_name_[] = "ly:context-def?";
+const char * const Context_def::type_p_name_ = "ly:context-def?";
 
 int
-Context_def::print_smob (SCM port, scm_print_state *)
+Context_def::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Context_def ", port);
   scm_display (context_name_, port);
@@ -97,7 +97,7 @@ Context_def::print_smob (SCM port, scm_print_state *)
 }
 
 SCM
-Context_def::mark_smob ()
+Context_def::mark_smob () const
 {
   ASSERT_LIVE_IS_ALLOWED (self_scm ());
 
@@ -294,7 +294,7 @@ Context_def::get_translator_names (SCM user_mod) const
       else if (scm_is_eq (tag, ly_symbol2scm ("remove"))
                && (scm_is_pair (arg)
                    || ly_is_procedure (arg)
-                   || get_translator (arg)))
+                   || get_translator_creator (arg)))
         l1 = scm_delete_x (arg, l1);
     }