* flower/include/std-string.hh:

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

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index aebdf84cf841925b98ece9b30483ad6b89b382a3..589dd0dbecf9cb1e2739161b2dbbab691280a9df 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -92,8 +92,8 @@ Rest_collision::calc_positioning_done (SCM smob)
   Grob *me = unsmob_grob (smob);
   extract_grob_set (me, "elements", elts);
 
-  Link_array__Grob_ rests;
-  Link_array__Grob_ notes;
+  vector<Grob*> rests;
+  vector<Grob*> notes;
 
   for (vsize i = 0; i < elts.size (); i++)
     {
@@ -137,7 +137,7 @@ Rest_collision::calc_positioning_done (SCM smob)
        This is incomplete: in case of an uneven number of rests, the
        center one should be centered on the staff.
       */
-      Drul_array<Link_array__Grob_ > ordered_rests;
+      Drul_array<vector<Grob*> > ordered_rests;
       for (vsize i = 0; i < rests.size (); i++)
        {
          Grob *r = Note_column::get_rest (rests[i]);