X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster-engraver.cc;h=faac5f79d0c90c5e66e82cbc0f9c41aa089f9c77;hb=4c6280c2ba6b0485aae7da731def216c2524bd0b;hp=ccd52d3dd2e0bee9942bc4fcfd46d2aa5dcd4d14;hpb=91821bd59959b1289f2d711509017a4dacebecd2;p=lilypond.git

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index ccd52d3dd2..faac5f79d0 100644
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -1,9 +1,9 @@
 /*
   cluster-engraver.cc -- implement Cluster_engraver
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
 
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -24,7 +24,7 @@ protected:
   void stop_translation_timestep ();
   virtual void finalize ();
 private:
-  Link_array<Music> cluster_notes_;
+  vector<Music*> cluster_notes_;
   Item *beacon_;
 
   void typeset_grobs ();
@@ -60,7 +60,7 @@ Cluster_spanner_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("cluster-note-event"))
     {
-      cluster_notes_.push (m);
+      cluster_notes_.push_back (m);
       return true;
     }
   else if (m->is_mus_type ("busy-playing-event"))
@@ -80,7 +80,7 @@ Cluster_spanner_engraver::process_music ()
       int pmax = INT_MIN;
       int pmin = INT_MAX;
 
-      for (int i = 0; i < cluster_notes_.size (); i++)
+      for (vsize i = 0; i < cluster_notes_.size (); i++)
 	{
 	  Pitch *pit = unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
 
@@ -97,9 +97,7 @@ Cluster_spanner_engraver::process_music ()
     }
 
   if (beacon_ && !spanner_)
-    {
-      spanner_ = make_spanner ("ClusterSpanner", cluster_notes_[0]->self_scm ());
-    }
+    spanner_ = make_spanner ("ClusterSpanner", cluster_notes_[0]->self_scm ());
 
   if (beacon_ && spanner_)
     {