diff options
| author | David Kastrup <dak@gnu.org> | 2016-06-26 00:32:38 +0200 |
|---|---|---|
| committer | David Kastrup <dak@gnu.org> | 2016-07-04 10:01:56 +0200 |
| commit | 04f4d06dbdb8473548f2caec6da5d64e53804a30 (patch) | |
| tree | 11753dc1dcabf05a20b166f70833cd9d95cafb8a /lily | |
| parent | 61b18f0aa7d4277c0ba066692c2b511badafea89 (diff) | |
Issue 4906/1: Rename ack_finder to method_finder
This additional overload streamlines things somewhat.
Diffstat (limited to 'lily')
| -rw-r--r-- | lily/include/translator.hh | 9 | ||||
| -rw-r--r-- | lily/include/translator.icc | 4 |
2 files changed, 4 insertions, 9 deletions
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 <void (NAME::*mf)()> \ @@ -54,7 +53,7 @@ return Callback_wrapper::make_smob<trampoline<NAME, mf> > (); \ } \ template <void (NAME::*callback)(Grob_info)> \ - static SCM ack_finder () { \ + static SCM method_finder () { \ return Callback2_wrapper::make_smob<ack_trampoline <NAME, callback> > (); \ } \ /* end #define */ @@ -170,10 +169,6 @@ protected: // should be private. 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 (); - 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]) |