Issue 2787: Sanitize usage of -DDEBUG, -DNDEBUG and assert

[lilypond.git] / lily / translator-group.cc

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 5a5b5695f018a5539a3d434f3739e90b2ec02ae2..24f1efaae94ed35758ef85ab36c96d6591ce04d8 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -58,7 +58,7 @@ Translator_group::connect_to_context (Context *c)
     }
 
   context_ = c;
-  c->event_source ()->add_listener (GET_LISTENER (create_child_translator),
+  c->event_source ()->add_listener (GET_LISTENER (Translator_group, create_child_translator),
                                     ly_symbol2scm ("AnnounceNewContext"));
   for (SCM tr_list = simple_trans_list_; scm_is_pair (tr_list); tr_list = scm_cdr (tr_list))
     {
@@ -75,7 +75,7 @@ Translator_group::disconnect_from_context ()
       Translator *tr = Translator::unsmob (scm_car (tr_list));
       tr->disconnect_from_context (context_);
     }
-  context_->event_source ()->remove_listener (GET_LISTENER (create_child_translator),
+  context_->event_source ()->remove_listener (GET_LISTENER (Translator_group, create_child_translator),
                                               ly_symbol2scm ("AnnounceNewContext"));
   context_ = 0;
   protected_events_ = SCM_EOL;
@@ -90,7 +90,7 @@ Translator_group::finalize ()
   Both filter_performers and filter_engravers used to use a direct dynamic_cast
   on the unsmobbed translator to be filtered, i.e.,
 
-  if (dynamic_cast<Performer *> (Translator::unsmob (scm_car (*tail))))
+  if (Performer::unsmob (scm_car (*tail)))
 
   but this caused mysterious optimisation issues in several GUB builds.  See
   issue #818 for the background to this change.
@@ -145,7 +145,6 @@ Translator_group::protect_event (SCM ev)
   Create a new translator for a newly created child context. Triggered
   by AnnounceNewContext events.
  */
-IMPLEMENT_LISTENER (Translator_group, create_child_translator);
 void
 Translator_group::create_child_translator (SCM sev)
 {
@@ -303,7 +302,7 @@ Translator_group::precompute_method_bindings ()
   for (SCM s = simple_trans_list_; scm_is_pair (s); s = scm_cdr (s))
     {
       Translator *tr = Translator::unsmob (scm_car (s));
-      Translator_void_method_ptr ptrs[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
+      Translator::Callback ptrs[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
       tr->fetch_precomputable_methods (ptrs);
 
       assert (tr);