Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / flower / interval.cc

diff --git a/flower/interval.cc b/flower/interval.cc
index d833d3151fe1306e164b7e4e2c017e2761b07c84..64f431f4f5589df47505e47652d20d3909265a14 100644 (file)
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "interval.hh"
@@ -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);
-