X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=bb6f743a24d5034eab9a0e6cb76805b11308a071;hb=1da74a6f525cdbb102ad93bfbcc36a620a5754ee;hp=967fc62179dbaed6384acbaeb617b0168840da52;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 967fc62179..bb6f743a24 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -45,8 +45,8 @@ Spanner::do_break_processing ()
 	  if (!parent->spanned_rank_iv ().superset (this->spanned_rank_iv ()))
 	    {
 	      programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.",
-					    name ().to_str0 (),
-					    parent->name ().to_str0 ()));
+					    name ().c_str (),
+					    parent->name ().c_str ()));
 	    }
 	}
     }
@@ -73,7 +73,7 @@ Spanner::do_break_processing ()
 
 	      assert (span->get_system ());
 	      span->get_system ()->typeset_grob (span);
-	      broken_intos_.push (span);
+	      broken_intos_.push_back (span);
 	    }
 	}
       while ((flip (&d)) != LEFT);
@@ -81,12 +81,12 @@ Spanner::do_break_processing ()
   else
     {
       System *root  = get_root_system (this);
-      Link_array<Item> break_points = root->broken_col_range (left, right);
+      vector<Item*> break_points = root->broken_col_range (left, right);
 
-      break_points.insert (left, 0);
-      break_points.push (right);
+      break_points.insert (break_points.begin () + 0, left);
+      break_points.push_back (right);
 
-      for (int i = 1; i < break_points.size (); i++)
+      for (vsize i = 1; i < break_points.size (); i++)
 	{
 	  Drul_array<Item *> bounds;
 	  bounds[LEFT] = break_points[i - 1];
@@ -120,16 +120,16 @@ Spanner::do_break_processing ()
 	  else
 	    {
 	      bounds[LEFT]->get_system ()->typeset_grob (span);
-	      broken_intos_.push (span);
+	      broken_intos_.push_back (span);
 	    }
 	}
     }
-  broken_intos_.sort (Spanner::compare);
-  for (int i = broken_intos_.size ();i--;)
+  vector_sort (broken_intos_, Spanner::compare);
+  for (vsize i = broken_intos_.size (); i--;)
     broken_intos_[i]->break_index_ = i;
 }
 
-int
+vsize
 Spanner::get_break_index () const
 {
   return break_index_;
@@ -238,12 +238,10 @@ Spanner::get_system () const
 Grob *
 Spanner::find_broken_piece (System *l) const
 {
-  int idx = binsearch_links (broken_intos_, (Spanner *)l, Spanner::compare);
-
-  if (idx < 0)
-    return 0;
-  else
+  vsize idx = binary_search (broken_intos_, (Spanner *)l, Spanner::compare);
+  if (idx != VPOS)
     return broken_intos_ [idx];
+  return 0;
 }
 
 int
@@ -294,7 +292,7 @@ Spanner::derived_mark () const
   while (flip (&d) != LEFT)
     ;
 
-  for (int i = broken_intos_.size (); i--;)
+  for (vsize i = broken_intos_.size (); i--;)
     scm_gc_mark (broken_intos_[i]->self_scm ());
 }
 
@@ -337,7 +335,7 @@ int
 broken_spanner_index (Spanner *sp)
 {
   Spanner *parent = dynamic_cast<Spanner *> (sp->original ());
-  return parent->broken_intos_.find_index (sp);
+  return find (parent->broken_intos_, sp) - parent->broken_intos_.begin ();
 }
 
 Spanner *