formatting cleanups, rename

[lilypond.git] / flower / interval.cc

diff --git a/flower/interval.cc b/flower/interval.cc
index 2a71fea2327574039165014c90910f5aeebbb4d6..10239516e6db19338243a0d45c84019e782f9eaf 100644 (file)
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,8 +11,6 @@
 #include "real.hh"
 #include "interval.tcc"
 
-template INTERVAL__INSTANTIATE (Real);
-
 Real
 Interval_t<Real>::infinity () 
 {
@@ -20,12 +18,11 @@ Interval_t<Real>::infinity ()
 }
 
 String
-Interval_t<Real>::T_to_str (Real r)
+Interval_t<Real>::T_to_string (Real r)
 {
-  return String (r);
+  return ::to_string (r);
 }
 
-template INTERVAL__INSTANTIATE (int);
 
 int
 Interval_t<int>::infinity () 
@@ -34,8 +31,11 @@ Interval_t<int>::infinity ()
 }
 
 String
-Interval_t<int>::T_to_str (int i)
+Interval_t<int>::T_to_string (int i)
 {
-  return String (i);
+  return ::to_string (i);
 }
 
+template INTERVAL__INSTANTIATE (int);
+template INTERVAL__INSTANTIATE (Real);
+