From 1a4fcab3c11fc6523874bce6b5dfd37c362f22d6 Mon Sep 17 00:00:00 2001
From: David Kastrup <dak@gnu.org>
Date: Sun, 26 Jun 2016 09:49:30 +0200
Subject: [PATCH] Issue 4906/2: Rename ack_trampoline to trampoline

This allows foregoing a dummy Translator::ack_trampoline definition.
---
 lily/include/engraver.hh   | 3 ++-
 lily/include/translator.hh | 8 ++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 868af25d45..074b531389 100644
--- 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 6120651957..09ab168658 100644
--- 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,
-- 
2.39.5