From b6ab7b0d552591f2039fd2c83c3566d7c2ce5d37 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sat, 4 Jun 2016 18:13:13 +0200 Subject: [PATCH] Issue 4997/5: Use Preinit in Engraver_group --- lily/engraver-group.cc | 10 ++++++---- lily/include/engraver-group.hh | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc index 35c14d460d..51af2d4afa 100644 --- a/lily/engraver-group.cc +++ b/lily/engraver-group.cc @@ -204,12 +204,14 @@ Engraver_group::do_announces () while (pending_grobs ()); } -Engraver_group::Engraver_group () +void +Engraver_group::pre_init () { - acknowledge_hash_table_drul_[LEFT] - = acknowledge_hash_table_drul_[RIGHT] - = SCM_EOL; + acknowledge_hash_table_drul_.set (SCM_EOL, SCM_EOL); +} +Engraver_group::Engraver_group () +{ acknowledge_hash_table_drul_[LEFT] = scm_c_make_hash_table (61); acknowledge_hash_table_drul_[RIGHT] = scm_c_make_hash_table (61); } diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh index 39e52f3c52..367b6a8f4c 100644 --- a/lily/include/engraver-group.hh +++ b/lily/include/engraver-group.hh @@ -33,7 +33,7 @@ public: Direction start_end () const { return start_end_; } }; -class Engraver_group : public Translator_group +class Engraver_group : public Preinit, public Translator_group { protected: vector announce_infos_; @@ -42,6 +42,7 @@ protected: void revert (SCM); public: DECLARE_CLASSNAME (Engraver_group); + void pre_init (); Engraver_group (); virtual void derived_mark () const; void do_announces (); -- 2.39.2