From: David Kastrup Date: Sat, 25 Jun 2016 22:32:38 +0000 (+0200) Subject: Issue 4906/1: Rename ack_finder to method_finder X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=04f4d06dbdb8473548f2caec6da5d64e53804a30;p=lilypond.git Issue 4906/1: Rename ack_finder to method_finder This additional overload streamlines things somewhat. --- diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 667fd6ddbd..6120651957 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -39,8 +39,7 @@ /* end #define */ #define TRANSLATOR_INHERIT(BASE) \ - using BASE::method_finder; \ - using BASE::ack_finder; + using BASE::method_finder #define DECLARE_TRANSLATOR_CALLBACKS(NAME) \ template \ @@ -54,7 +53,7 @@ return Callback_wrapper::make_smob > (); \ } \ template \ - static SCM ack_finder () { \ + static SCM method_finder () { \ return Callback2_wrapper::make_smob > (); \ } \ /* end #define */ @@ -170,10 +169,6 @@ protected: // should be private. template static SCM ack_trampoline (SCM, SCM, SCM); - // Overriden in Engraver. Don't instantiate. - template - static SCM ack_finder (); - virtual void derived_mark () const; static SCM event_class_symbol (const char *ev_class); SCM static_translator_description (const char *grobs, diff --git a/lily/include/translator.icc b/lily/include/translator.icc index 3d038b68e6..df618db761 100644 --- a/lily/include/translator.icc +++ b/lily/include/translator.icc @@ -97,11 +97,11 @@ void add_acknowledger (SCM ptr, SCM &ack_hash); #define ADD_ACKNOWLEDGER(CLASS, NAME) \ - add_acknowledger (ack_finder<&CLASS::acknowledge_ ## NAME> (), \ + add_acknowledger (method_finder<&CLASS::acknowledge_ ## NAME> (), \ #NAME, acknowledge_static_array_drul_[START]) #define ADD_END_ACKNOWLEDGER(CLASS, NAME) \ - add_acknowledger (ack_finder<&CLASS::acknowledge_end_ ## NAME> (), \ + add_acknowledger (method_finder<&CLASS::acknowledge_end_ ## NAME> (), \ #NAME, acknowledge_static_array_drul_[STOP])