From: David Kastrup Date: Sun, 19 Jun 2016 14:36:57 +0000 (+0200) Subject: Issue 4906/5: Don't let ADD_END_ACKNOWLEDGER_FOR add end_ to callback X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=369988ff777e4cec3228ee02a77f11e154cc842b;p=lilypond.git Issue 4906/5: Don't let ADD_END_ACKNOWLEDGER_FOR add end_ to callback --- diff --git a/lily/include/translator.icc b/lily/include/translator.icc index 02f9fbe8c7..80a7466cd1 100644 --- a/lily/include/translator.icc +++ b/lily/include/translator.icc @@ -102,11 +102,15 @@ void add_acknowledger (SCM ptr, #define ADD_ACKNOWLEDGER(CLASS, NAME) ADD_ACKNOWLEDGER_FOR (CLASS, NAME, NAME) +// ADD_END_ACKNOWLEDGER_FOR requires your NAME to actually be +// end_whatever if you are utilizing acknowledge_end_whatever as a +// different end acknowledger. #define ADD_END_ACKNOWLEDGER_FOR(CLASS, NAME, GROB) \ - add_acknowledger (method_finder<&CLASS::acknowledge_end_ ## NAME> (), \ + add_acknowledger (method_finder<&CLASS::acknowledge_ ## NAME> (), \ #GROB, acknowledge_static_array_drul_[STOP]) -#define ADD_END_ACKNOWLEDGER(CLASS, NAME) ADD_END_ACKNOWLEDGER_FOR (CLASS, NAME, NAME) +#define ADD_END_ACKNOWLEDGER(CLASS, NAME) \ + ADD_END_ACKNOWLEDGER_FOR (CLASS, end_ ## NAME, NAME) /* Implement the method cl::listen_##m, and make it listen to stream