X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finterval-set.cc;h=49ad550bf9d5c42f81ba8f2a5c9a93ffec7bec1c;hb=3f611b64f3488269b1a2bfe7e511ce4d4677c0f6;hp=89e518883085e1bf7051cba084a0f654f8035e00;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/flower/interval-set.cc b/flower/interval-set.cc index 89e5188830..49ad550bf9 100644 --- a/flower/interval-set.cc +++ b/flower/interval-set.cc @@ -27,13 +27,13 @@ Interval_set::set_full () allowed_regions_.clear (); Interval s; s.set_full (); - allowed_regions_.push (s); + allowed_regions_.push_back (s); } void Interval_set::remove_interval (Interval rm) { - for (int i = 0; i < allowed_regions_.size ();) + for (vsize i = 0; i < allowed_regions_.size ();) { Interval s = rm; @@ -49,13 +49,13 @@ Interval_set::remove_interval (Interval rm) if (!before.is_empty () && before.length () > 0.0) { - allowed_regions_.insert (before, i); + allowed_regions_.insert (allowed_regions_.begin () + i, before); i++; } - allowed_regions_.del (i); + allowed_regions_.erase (allowed_regions_.begin () + i); if (!after.is_empty () && after.length () > 0.0) { - allowed_regions_.insert (after, i); + allowed_regions_.insert (allowed_regions_.begin () + i, after); i++; } }