send_stream_event(...); macro should only produce one statement

[lilypond.git] / lily / include / score-engraver.hh

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index 7bf177576b8ea2578ec393e2eafdc2069b76e2fd..86bbad2500e16a7c8c1fc9224eea9efe5d9b6c24 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -26,15 +26,15 @@ class Score_engraver : public Engraver_group
 {
   System *system_;
 
-  vector<Grob *> elems_;
+  std::vector<Grob *> elems_;
   Paper_score *pscore_;
 
   void typeset_all ();
 
 protected:
-  DECLARE_LISTENER (finish);
-  DECLARE_LISTENER (prepare);
-  DECLARE_LISTENER (one_time_step);
+  void finish (SCM);
+  void prepare (SCM);
+  void one_time_step (SCM);
 
   /* Engraver_group_engraver interface */
   virtual void connect_to_context (Context *);