Issue 4630/2: Add override_input to music created from loc_on_music

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

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