Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen

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

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 994d642c0ae0352baa371dcb0d03b240733f0cda..1d9182c16cc719c5a5794b844830ecece10f2ce7 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -102,7 +102,7 @@ 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);
 
-      std::string glyph_string = scm_is_string (glyph) ? ly_scm2string (glyph) : "";
+      string glyph_string = scm_is_string (glyph) ? ly_scm2string (glyph) : "";
       if (glyph_string.substr (0, 1) == "|"
          || glyph_string.substr (0, 1) == ".")
        {
@@ -134,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];
 
@@ -148,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;
@@ -176,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))