From: David Kastrup <dak@gnu.org>
Date: Sat, 18 Jun 2016 08:23:30 +0000 (+0200)
Subject: Issue 4899/5: Remove Translator::method_find_base
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1906a2283e10713232141886afd11dad96efcee1;p=lilypond.git

Issue 4899/5: Remove Translator::method_find_base

It's basically a trivial replacement and confuses more than it helps.
---

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 5197305ea2..d4ea41f934 100644
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -43,7 +43,10 @@
 
 #define DECLARE_TRANSLATOR_CALLBACKS(NAME)                              \
   template <void (NAME::*mf)()>                                         \
-  static SCM method_finder () { return method_find_base<NAME, mf> (); } \
+  static SCM method_finder ()                                           \
+  {                                                                     \
+    return Callback0_wrapper::make_smob<NAME, mf> ();                   \
+  }                                                                     \
   template <void (NAME::*mf)(Stream_event *)>                           \
   static SCM method_finder ()                                           \
   {                                                                     \
@@ -154,10 +157,6 @@ protected:                      // should be private.
     return SCM_UNSPECIFIED;
   }
 
-  template <class T, void (T::*mf)()>
-  static SCM
-  method_find_base () { return Callback0_wrapper::make_smob<T, mf> (); }
-
   // Fallback for non-overriden callbacks for which &T::x degrades to
   // &Translator::x
   template <void (Translator::*)()>