From 4248f11e51e95dcf14ff67cda43be64c0ea53871 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 31 Jan 2006 10:20:00 +0000 Subject: [PATCH] (spanner::find_rods): Fix >=0 loop for unsigned vsize. --- ChangeLog | 3 +++ lily/include/separating-group-spanner.hh | 2 +- lily/separating-group-spanner.cc | 7 +++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3e75d3c2c..16325f5763 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-01-31 Jan Nieuwenhuizen + * lily/separating-group-spanner.cc (spanner::find_rods): Fix >=0 + loop for unsigned vsize. + * configure.in (--enable-std-vector): New option. (--enable-std-string): On by default. diff --git a/lily/include/separating-group-spanner.hh b/lily/include/separating-group-spanner.hh index b569d5ee1f..4e2f2f4380 100644 --- a/lily/include/separating-group-spanner.hh +++ b/lily/include/separating-group-spanner.hh @@ -15,7 +15,7 @@ class Separating_group_spanner { static void find_rods (Item *, Link_array const &separators, - int idx, + vsize idx, Real); public: static void add_spacing_unit (Grob *me, Item *); diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index c019fc0430..94aac09734 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -17,7 +17,7 @@ void Separating_group_spanner::find_rods (Item *r, Link_array const &separators, - int idx, + vsize idx, Real padding) { @@ -27,7 +27,7 @@ Separating_group_spanner::find_rods (Item *r, most cases, the interesting L will just be the first entry of NEXT, making it linear in most of the cases. */ - for (; idx >= 0; idx--) + for (; idx != VPOS; idx--) { Item *l = dynamic_cast (separators[idx]); Item *lb = l->find_prebroken_piece (RIGHT); @@ -83,8 +83,7 @@ Separating_group_spanner::set_spacing_rods (SCM smob) Real padding = robust_scm2double (me->get_property ("padding"), 0.1); extract_grob_set (me, "elements", elts); - for (vsize i = elts.size (); - i-- > 1;) + for (vsize i = elts.size (); i-- > 1;) { Item *r = dynamic_cast (elts[i]); if (!r) -- 2.39.5