X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finterval.hh;h=c4beb9bb99eebab907601bc392bd1250c4cd4e69;hb=cb0b407e567feca71cbc5f9479a06b266c69a26c;hp=88cd01f89f8342a2d478ce39a6f2b6b4d8812d90;hpb=1de3d397c18622b6061402fef18e625701712bc5;p=lilypond.git

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 88cd01f89f..c4beb9bb99 100644
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -35,7 +35,7 @@ struct Interval_t : public Drul_array<T>
   using Drul_array<T>::at;
 
   static T infinity ();
-  static string T_to_string (T arg);
+  static std::string T_to_string (T arg);
   T center () const;
   void translate (T t)
   {
@@ -65,8 +65,8 @@ struct Interval_t : public Drul_array<T>
   void intersect (Interval_t<T> h);
   void add_point (T p)
   {
-    at (LEFT) = min (at (LEFT), p);
-    at (RIGHT) = max (at (RIGHT), p);
+    at (LEFT) = std::min (at (LEFT), p);
+    at (RIGHT) = std::max (at (RIGHT), p);
   }
   T length () const;
 
@@ -120,7 +120,7 @@ struct Interval_t : public Drul_array<T>
   }
 
   Real linear_combination (Real x) const;
-  string to_string () const;
+  std::string to_string () const;
 
   bool contains (T r) const;
   void negate ()