* configure.in (--enable-std-vector): New option.

[lilypond.git] / lily / staff-spacing.cc

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 82aa3d9c1b1df65cd6a7644d523f06fa58b327c0..305d3a2468902d439ed477c665e16f817350560a 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-spacing.hh"
@@ -102,8 +102,9 @@ Staff_spacing::bar_y_positions (Grob *bar_grob)
       SCM glyph = bar_grob->get_property ("glyph-name");
       Grob *staff_sym = Staff_symbol_referencer::get_staff_symbol (bar_grob);
 
-      String glyph_string = scm_is_string (glyph) ? ly_scm2string (glyph) : "";
-      if (glyph_string.left_string (1) == "|" || glyph_string.left_string (1) == ".")
+      std::string glyph_string = scm_is_string (glyph) ? ly_scm2string (glyph) : "";
+      if (glyph_string.substr (0, 1) == "|"
+         || glyph_string.substr (0, 1) == ".")
        {
          Grob *common = bar_grob->common_refpoint (staff_sym, Y_AXIS);
          Interval bar_size = bar_grob->extent (common, Y_AXIS);
@@ -133,7 +134,7 @@ Staff_spacing::next_notes_correction (Grob *me, Grob *last_grob,
   *compound_space = 0.0;
   int wish_count = 0;
   
-  for (int i = right_items.size (); i--;)
+  for (vsize i = right_items.size (); i--;)
     {
       Grob *g = right_items[i];
 
@@ -147,7 +148,7 @@ Staff_spacing::next_notes_correction (Grob *me, Grob *last_grob,
       wish_count ++;
       
       extract_grob_set (g, "elements", elts);
-      for (int j = elts.size (); j--;)
+      for (vsize j = elts.size (); j--;)
        {
          Real space = 0.0;
          Real fixed = 0.0;
@@ -175,7 +176,7 @@ Staff_spacing::get_spacing_params (Grob *me, Real *space, Real *fixed)
   Item *me_item = dynamic_cast<Item *> (me);
 
   extract_grob_set (me, "left-items", items);
-  for (int i = items.size (); i--;)
+  for (vsize i = items.size (); i--;)
     {
       Grob *cand = items[i];
       if (cand && Separation_item::has_interface (cand))