Merge branch 'master' into translation

[lilypond.git] / lily / translator-dispatch-list.cc

diff --git a/lily/translator-dispatch-list.cc b/lily/translator-dispatch-list.cc
index 4faac7116781bd08bf7abe3e83ca7042c62fc474..ed968c571a5d504484cd99b1951af5b3b14b7c38 100644 (file)
--- a/lily/translator-dispatch-list.cc
+++ b/lily/translator-dispatch-list.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -55,7 +55,7 @@ Engraver_dispatch_list::create (SCM trans_list,
       entry.engraver_ = eng;
       for (SCM i = iface_list; scm_is_pair (i); i = scm_cdr (i))
         {
-          Engraver_void_function_engraver_grob_info ptr
+          Translator::Grob_info_callback ptr
             = (start_end == START)
               ? eng->get_acknowledger (scm_car (i))
               : eng->get_end_acknowledger (scm_car (i));