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

diff --git a/flower/interval.cc b/flower/interval.cc
index 2a71fea232..a73da9e788 100644
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -1,41 +1,53 @@
 /*
-  interval.cc -- instantiate Interval_t<Real>
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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);