X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finterval-set.cc;h=84bde76a9cfe2a00d9cba2879d2f74f5362249e9;hb=24f6d4147e46775fe83b6e65b843365f3daa94e0;hp=193be7f7f1605fda8e22d5b6c1cba5a23f5e8ba9;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git diff --git a/flower/interval-set.cc b/flower/interval-set.cc index 193be7f7f1..84bde76a9c 100644 --- 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 + Copyright (C) 2004--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -60,13 +60,13 @@ Interval_set::remove_interval (Interval rm) if (!before.is_empty () && before.length () > 0.0) { - allowed_regions_.insert (allowed_regions_.begin () + i, before); + allowed_regions_.insert (allowed_regions_.begin () + (long)i, before); i++; } - allowed_regions_.erase (allowed_regions_.begin () + i); + allowed_regions_.erase (allowed_regions_.begin () + (long)i); if (!after.is_empty () && after.length () > 0.0) { - allowed_regions_.insert (allowed_regions_.begin () + i, after); + allowed_regions_.insert (allowed_regions_.begin () + (long)i, after); i++; } }