Revert "Issue 4550 (2/2) Avoid "using namespace std;" in included files"

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

diff --git a/flower/interval-set.cc b/flower/interval-set.cc
index fca942b966b4cf4439cc57d11b6d9309457d00fd..acc282bbdb2dc975f7f511437f34f6aae26fb841 100644 (file)
--- a/flower/interval-set.cc
+++ b/flower/interval-set.cc
@@ -58,7 +58,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);
     }