Issue 4906/2: Rename ack_trampoline to trampoline

[lilypond.git] / lily / include / translator.hh

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,