* lily/grob.cc:

[lilypond.git] / lily / collision-engraver.cc

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 45d3f948d7ab01ccac9ed8e83d9ca1b379dd2360..404c1a5c71b1d73736bd26f1af8f7c5f0d195326 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -14,7 +14,7 @@
 class Collision_engraver : public Engraver
 {
   Item *col_;
-  Link_array<Grob> note_columns_;
+  vector<Grob*> note_columns_;
 
 protected:
   DECLARE_ACKNOWLEDGER (note_column);
@@ -32,7 +32,7 @@ Collision_engraver::process_acknowledged ()
   if (!col_)
     col_ = make_item ("NoteCollision", SCM_EOL);
 
-  for (int i = 0; i < note_columns_.size (); i++)
+  for (vsize i = 0; i < note_columns_.size (); i++)
     Note_collision_interface::add_column (col_, note_columns_[i]);
 }
 
@@ -45,7 +45,7 @@ Collision_engraver::acknowledge_note_column (Grob_info i)
       if (Note_column::has_rests (i.grob ()) || i.grob ()->get_parent (X_AXIS))
        return;
 
-      note_columns_.push (i.grob ());
+      note_columns_.push_back (i.grob ());
     }
 }