Issue 4906/2: Rename ack_trampoline to trampoline

This allows foregoing a dummy Translator::ack_trampoline definition.

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 868af25d4541558c029507fbcc7b2a586119843c..074b5313898e9c0ef0e0945dc6ac2bbe33df7487 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -48,8 +48,9 @@ protected:
   Engraver_group *get_daddy_engraver () const;
 
 public:
+  using Translator::trampoline;
   template <class T, void (T::*callback)(Grob_info)>
-  static SCM ack_trampoline (SCM target, SCM grob, SCM source_engraver)
+  static SCM trampoline (SCM target, SCM grob, SCM source_engraver)
   {
     T *t = LY_ASSERT_SMOB (T, target, 1);
     Grob *g = LY_ASSERT_SMOB (Grob, grob, 2);

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 6120651957f831cf406c585bccbfc5130c0468d6..09ab16865815e322e02ecd476540555d4ee81101 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -52,9 +52,9 @@
   {                                                                     \
     return Callback_wrapper::make_smob<trampoline<NAME, mf> > ();       \
   }                                                                     \
-  template <void (NAME::*callback)(Grob_info)>                          \
+  template <void (NAME::*mf)(Grob_info)>                                \
   static SCM method_finder () {                                         \
-    return Callback2_wrapper::make_smob<ack_trampoline <NAME, callback> > (); \
+    return Callback2_wrapper::make_smob<trampoline <NAME, mf> > ();     \
   }                                                                     \
   /* end #define */
 
@@ -165,10 +165,6 @@ protected:                      // should be private.
   static SCM
   method_finder () { return SCM_UNDEFINED; }
 
-  // Overriden in Engraver.  Don't instantiate.
-  template <class T, void (T::*)(Grob_info)>
-  static SCM ack_trampoline (SCM, SCM, SCM);
-
   virtual void derived_mark () const;
   static SCM event_class_symbol (const char *ev_class);
   SCM static_translator_description (const char *grobs,