X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finterval-set.cc;h=da857f277c8e3e892effff8438351425138ed420;hb=750b714488c5af6eae22d07163bba8b554734ac6;hp=fca942b966b4cf4439cc57d11b6d9309457d00fd;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git

diff --git a/flower/interval-set.cc b/flower/interval-set.cc
index fca942b966..da857f277c 100644
--- a/flower/interval-set.cc
+++ b/flower/interval-set.cc
@@ -19,8 +19,6 @@
 
 #include "interval-set.hh"
 
-using std::vector;
-
 /*
   A union of intervals in the real line.
 
@@ -58,7 +56,7 @@ Interval_set::interval_union (vector<Interval> ivs)
 
       if (last[RIGHT] >= iv[LEFT])
         // overlapping intervals: merge them
-        last[RIGHT] = std::max (last[RIGHT], iv[RIGHT]);
+        last[RIGHT] = max (last[RIGHT], iv[RIGHT]);
       else if (!iv.is_empty ())
         ret.intervals_.push_back (iv);
     }