X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=flower%2Finclude%2Finterval.tcc;h=396904d05d908d9676e14f523285a9e5a419e986;hb=b37e3f652677ae0298423db9fa0e552e5fce0c92;hp=9af4047a8c35e5d133d28cf39282ece1de610cc8;hpb=32666ceb04d43968c3a17e6d50a25463dc8f7784;p=lilypond.git

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 9af4047a8c..396904d05d 100644
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -12,7 +12,7 @@
 #include <cassert>
 
 #include "interval.hh"
-#include "string.hh"
+#include "std-string.hh"
 
 // MacOS 10.3 problems:
 // #include <cmath>
@@ -105,15 +105,15 @@ Interval_t<T>::intersect (Interval_t<T> h)
 }
 
 template<class T>
-Std_string
+std::string
 Interval_t<T>::to_string () const
 {
   if (is_empty ())
     return "[empty]";
-  Std_string s ("[");
+  std::string s ("[");
 
-  return (s + T_to_string (elem (LEFT)) + Std_string (",")
-	  + T_to_string (elem (RIGHT)) + Std_string ("]"));
+  return (s + T_to_string (elem (LEFT)) + std::string (",")
+	  + T_to_string (elem (RIGHT)) + std::string ("]"));
 }
 
 template<class T>