X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-concave.cc;h=ee351d0a26739d2fba275b4615cd108b3bfad33b;hb=8f5cd22af76fcb5c77853a5ede8b94ebef97caef;hp=00ceb61dcd8479e0bdf0354775278c34e9c52edf;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/beam-concave.cc b/lily/beam-concave.cc
index 00ceb61dcd..ee351d0a26 100644
--- a/lily/beam-concave.cc
+++ b/lily/beam-concave.cc
@@ -3,14 +3,14 @@
 */
 
 #include "pointer-group-interface.hh"
-#include "std-vector.hh"
 #include "stem.hh"
 #include "beam.hh"
+#include "grob.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 
 bool
-is_concave_single_notes (std::vector<int> const &positions, Direction beam_dir)
+is_concave_single_notes (vector<int> const &positions, Direction beam_dir)
 {
   Interval covering;
   covering.add_point (positions[0]);
@@ -57,7 +57,7 @@ is_concave_single_notes (std::vector<int> const &positions, Direction beam_dir)
 }
 
 Real
-calc_positions_concaveness (std::vector<int> const &positions, Direction beam_dir)
+calc_positions_concaveness (vector<int> const &positions, Direction beam_dir)
 {
   Real dy = positions.back () - positions[0];
   Real slope = dy / Real (positions.size () - 1);
@@ -87,7 +87,7 @@ Beam::calc_concaveness (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
-  Link_array<Grob> stems
+  vector<Grob*> stems
     = extract_grob_array (me, "stems");
 
   if (is_knee (me))
@@ -97,7 +97,7 @@ Beam::calc_concaveness (SCM smob)
   for (vsize i = stems.size (); i--;)
     {
       if (Stem::is_invisible (stems[i]))
-	stems.del (i);
+	stems.erase (stems.begin () + i);
       else
 	{
 	  if (Direction dir = get_grob_direction (stems[i]))
@@ -108,8 +108,8 @@ Beam::calc_concaveness (SCM smob)
   if (stems.size () <= 2)
     return SCM_UNSPECIFIED;
 
-  std::vector<int> close_positions;
-  std::vector<int> far_positions;
+  vector<int> close_positions;
+  vector<int> far_positions;
   for (vsize i = 0; i < stems.size (); i++)
     {
       /*