From: David Kastrup <dak@gnu.org>
Date: Sat, 18 Jun 2016 08:49:06 +0000 (+0200)
Subject: Issue 4899/6: Remove {Translator,Engraver}::ack_find_base
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5c7507115ca03b8f2f2b46e34d670ed50074b00d;p=lilypond.git

Issue 4899/6: Remove {Translator,Engraver}::ack_find_base

The indirection and complication added by it does not really
help in any manner.
---

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index d0f6e8979c..928f6a969d 100644
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -58,9 +58,6 @@ public:
     (t->*callback) (Grob_info (e, g));
     return SCM_UNSPECIFIED;
   }
-  template <class T, void (T::*callback)(Grob_info)>
-  static SCM ack_find_base ()
-  { return Callback2_wrapper::make_smob<ack_trampoline<T, callback> > (); }
 
   /**
      Announce element. Default: pass on to daddy. Utility
diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index d4ea41f934..cd05091712 100644
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -53,7 +53,9 @@
     return Callback_wrapper::make_smob<trampoline<NAME, mf> > ();       \
   }                                                                     \
   template <void (NAME::*callback)(Grob_info)>                          \
-  static SCM ack_finder () { return ack_find_base<NAME, callback> (); } \
+  static SCM ack_finder () {                                            \
+    return Callback2_wrapper::make_smob<ack_trampoline <NAME, callback> > (); \
+  }                                                                     \
   /* end #define */
 
 /*
@@ -163,14 +165,13 @@ protected:                      // should be private.
   static SCM
   method_finder () { return SCM_UNDEFINED; }
 
-  // Overriden in Engraver.
-  template <class T, void (T::*callback)(Grob_info)>
-  static SCM
-  ack_find_base () { return SCM_UNDEFINED; }
+  // Overriden in Engraver.  Don't instantiate.
+  template <class T, void (T::*)(Grob_info)>
+  static SCM ack_trampoline (SCM, SCM, SCM);
 
+  // Overriden in Engraver.  Don't instantiate.
   template <void (Translator::*)(Grob_info)>
-  static SCM
-  ack_finder () { return SCM_UNDEFINED; }
+  static SCM ack_finder ();
 
   virtual void derived_mark () const;
   static SCM event_class_symbol (const char *ev_class);