]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 4899/5: Remove Translator::method_find_base
authorDavid Kastrup <dak@gnu.org>
Sat, 18 Jun 2016 08:23:30 +0000 (10:23 +0200)
committerDavid Kastrup <dak@gnu.org>
Thu, 23 Jun 2016 08:12:24 +0000 (10:12 +0200)
It's basically a trivial replacement and confuses more than it helps.

lily/include/translator.hh

index 5197305ea280057977b37a79567998e0a6dc48c3..d4ea41f93418e854fe42df12d8eacb80c5bd1716 100644 (file)
 
 #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::*)()>