Imported Upstream version 2.16.0

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

diff --git a/flower/interval-set.cc b/flower/interval-set.cc
index 24b05c84196175c571415928e665d165b027a667..84bde76a9cfe2a00d9cba2879d2f74f5362249e9 100644 (file)
--- a/flower/interval-set.cc
+++ b/flower/interval-set.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -51,26 +51,26 @@ Interval_set::remove_interval (Interval rm)
       s.intersect (allowed_regions_[i]);
 
       if (!s.is_empty ())
-       {
-         Interval before = allowed_regions_[i];
-         Interval after = allowed_regions_[i];
+        {
+          Interval before = allowed_regions_[i];
+          Interval after = allowed_regions_[i];
 
-         before[RIGHT] = s[LEFT];
-         after[LEFT] = s[RIGHT];
+          before[RIGHT] = s[LEFT];
+          after[LEFT] = s[RIGHT];
 
-         if (!before.is_empty () && before.length () > 0.0)
-           {
-             allowed_regions_.insert (allowed_regions_.begin () + i, before);
-             i++;
-           }
-         allowed_regions_.erase (allowed_regions_.begin () + i);
-         if (!after.is_empty () && after.length () > 0.0)
-           {
-             allowed_regions_.insert (allowed_regions_.begin () + i, after);
-             i++;
-           }
-       }
+          if (!before.is_empty () && before.length () > 0.0)
+            {
+              allowed_regions_.insert (allowed_regions_.begin () + (long)i, before);
+              i++;
+            }
+          allowed_regions_.erase (allowed_regions_.begin () + (long)i);
+          if (!after.is_empty () && after.length () > 0.0)
+            {
+              allowed_regions_.insert (allowed_regions_.begin () + (long)i, after);
+              i++;
+            }
+        }
       else
-       i++;
+        i++;
     }
 }