Merge branch 'microtonal'

[lilypond.git] / flower / interval.cc

diff --git a/flower/interval.cc b/flower/interval.cc
index aaa552353d3d6dc1bc01b094bfff4c7886756b04..b78579685175336348943f1ee7081b99df63a3d8 100644 (file)
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -18,7 +18,7 @@ Interval_t<Real>::infinity ()
 }
 
 template<>
-String
+string
 Interval_t<Real>::T_to_string (Real r)
 {
   return ::to_string (r);
@@ -32,7 +32,7 @@ Interval_t<int>::infinity ()
 }
 
 template<>
-String
+string
 Interval_t<int>::T_to_string (int i)
 {
   return ::to_string (i);
@@ -40,4 +40,3 @@ Interval_t<int>::T_to_string (int i)
 
 template INTERVAL__INSTANTIATE (int);
 template INTERVAL__INSTANTIATE (Real);
-