X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision-engraver.cc;h=d0704a10b50c28a04b57da7dcbd5908a86b4a169;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=2fa66dbe54361f09589e4ebfd0d75121adae307a;hpb=49cae4a7b28489a51e8c97dc33fc64cf83ea25e7;p=lilypond.git

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 2fa66dbe54..d0704a10b5 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -3,19 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "warn.hh"
 #include "engraver.hh"
 #include "rest-collision.hh"
 #include "note-column.hh"
+#include "item.hh"
 
 class Rest_collision_engraver : public Engraver
 {
   Item *rest_collision_;
   vsize rest_count_;
-  Link_array__Grob_ note_columns_;
+  vector<Grob*> note_columns_;
 protected:
   DECLARE_ACKNOWLEDGER (note_column);
   void process_acknowledged ();
@@ -68,6 +69,5 @@ ADD_ACKNOWLEDGER (Rest_collision_engraver, note_column);
 ADD_TRANSLATOR (Rest_collision_engraver,
 		/* doc */ "Handles collisions of rests.",
 		/* create */ "RestCollision",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");