X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finterval.cc;h=ed45c665620eb42349595f90e5d2aab081cb816b;hb=97ba99b3a0540ff296af752901a575632dc20371;hp=2a71fea2327574039165014c90910f5aeebbb4d6;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/flower/interval.cc b/flower/interval.cc
index 2a71fea232..ed45c66562 100644
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -3,39 +3,40 @@
 
   source file of the Flower Library
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #include "interval.hh"
-#include "real.hh"
-#include "interval.tcc"
 
-template INTERVAL__INSTANTIATE (Real);
+#include "interval.tcc"
 
+template<>
 Real
-Interval_t<Real>::infinity () 
+Interval_t<Real>::infinity ()
 {
   return HUGE_VAL;
 }
 
-String
-Interval_t<Real>::T_to_str (Real r)
+template<>
+string
+Interval_t<Real>::T_to_string (Real r)
 {
-  return String (r);
+  return ::to_string (r);
 }
 
-template INTERVAL__INSTANTIATE (int);
-
+template<>
 int
-Interval_t<int>::infinity () 
+Interval_t<int>::infinity ()
 {
   return INT_MAX;
 }
 
-String
-Interval_t<int>::T_to_str (int i)
+template<>
+string
+Interval_t<int>::T_to_string (int i)
 {
-  return String (i);
+  return ::to_string (i);
 }
 
+template INTERVAL__INSTANTIATE (int);
+template INTERVAL__INSTANTIATE (Real);