Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into kainhofer

[lilypond.git] / flower / interval-set.cc

diff --git a/flower/interval-set.cc b/flower/interval-set.cc
index c0d3241fc9400a52ede9599df57418e21fc088a8..49ad550bf9d5c42f81ba8f2a5c9a93ffec7bec1c 100644 (file)
--- a/flower/interval-set.cc
+++ b/flower/interval-set.cc
@@ -1,10 +1,9 @@
-/* 
-   interval-set.hh -- implement Interval_set 
-  
-   source file of the GNU LilyPond music typesetter
-  
-   (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+/*
+  interval-set.hh -- implement Interval_set
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "interval-set.hh"
@@ -28,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;
 
@@ -50,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++;
            }
        }