X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finterval.cc;h=04b141159d6c6c14d2a9245e0d73c0c40c38e458;hb=1d136d4974b57ac7b3e4401e1cde5ea897e1e91b;hp=571d23f530514c241a11b2ae6b016056a4859fcd;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/flower/interval.cc b/flower/interval.cc
index 571d23f530..04b141159d 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.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 to_str (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 to_str (i);
+  return ::to_string (i);
 }
 
+template INTERVAL__INSTANTIATE (int);
+template INTERVAL__INSTANTIATE (Real);