X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver-group.hh;h=bbb759b1ace6acbe03220b82087f934a619f0803;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=a53ec9f3d2529a4377e4a3222ee33e799c419add;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh index a53ec9f3d2..bbb759b1ac 100644 --- a/lily/include/engraver-group.hh +++ b/lily/include/engraver-group.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2010 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,7 @@ #include "engraver.hh" #include "translator-group.hh" -class Engraver_group : public virtual Translator_group +class Engraver_group : public Translator_group { protected: vector announce_infos_; @@ -31,8 +31,7 @@ protected: DECLARE_LISTENER (override); DECLARE_LISTENER (revert); public: - VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Engraver_group); - + DECLARE_CLASSNAME (Engraver_group); Engraver_group (); virtual void derived_mark () const; void do_announces (); @@ -50,4 +49,3 @@ void engraver_each (SCM list, Engraver_method method); #endif /* ENGRAVERGROUP_HH */ -