X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-substitution.cc;h=0c1e996580e7ca3826b8371ab72c489daf2b1079;hb=68d7330f72a14a8df49c49ed1566179248096092;hp=d14092876f7a401f2584af4a50a2e21cf7c0d1ed;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index d14092876f..0c1e996580 100644
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -139,17 +139,17 @@ do_break_substitution (SCM src)
 /*
   Perform substitution on GROB_LIST using a constant amount of stack.
 */
-Link_array<Grob> temporary_substition_array;
+vector<Grob*> temporary_substition_array;
 void
 substitute_grob_array (Grob_array *grob_arr, Grob_array *new_arr)
 {
-  Link_array<Grob> &old_grobs (grob_arr->array_reference ());
-  Link_array<Grob> *new_grobs (new_arr == grob_arr
+  vector<Grob*> &old_grobs (grob_arr->array_reference ());
+  vector<Grob*> *new_grobs (new_arr == grob_arr
 			       ? & temporary_substition_array
 			       : &new_arr->array_reference ());
 
   new_grobs->resize (old_grobs.size ());
-  Grob **array = (Grob **) new_grobs->accesses ();
+  Grob **array = (Grob **) new_grobs->data ();
   Grob **ptr = array;
   for (vsize i = 0; i < old_grobs.size (); i++)
     {
@@ -356,15 +356,15 @@ Spanner::fast_substitute_grob_array (SCM sym,
   qsort (vec, item_index,
 	 sizeof (Substitution_entry), &Substitution_entry::item_compare);
 
-  std::vector<Slice> item_indices;
-  std::vector<Slice> spanner_indices;
+  vector<Slice> item_indices;
+  vector<Slice> spanner_indices;
   for (int i = 0; i <= system_range.length (); i++)
     {
       item_indices.push_back (Slice (len, 0));
       spanner_indices.push_back (Slice (len, 0));
     }
 
-  std::vector<Slice> *arrs[]
+  vector<Slice> *arrs[]
     = {
     &item_indices, &spanner_indices
   };