Fix \lyricsto Staff = "sop" syntax

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 4a234e28172f48b4c55ceee0a0c07a82bb6cc05b..bdc55f0f05467a4d4cb5fd56b548deb9995329c2 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -207,7 +207,7 @@ Translator::get_score_context () const
   return daddy_context_->get_score_context ();
 }
 
-const char Translator::type_p_name_[] = "ly:translator?";
+const char * const Translator::type_p_name_ = "ly:translator?";
 
 bool
 Translator::must_be_last () const
@@ -232,9 +232,9 @@ Translator::print_smob (SCM port, scm_print_state *) const
 void
 add_acknowledger (SCM ptr,
                   char const *func_name,
-                  Protected_scm &ack_hash)
+                  SCM &ack_hash)
 {
-  if (SCM_UNBNDP (SCM (ack_hash)))
+  if (SCM_UNBNDP (ack_hash))
     ack_hash = Scheme_hash_table::make_smob ();
 
   string interface_name (func_name);