Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

[lilypond.git] / flower / include / interval.tcc

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index a72837bd9facee3c0f3496e5c7ec46ff94fc8263..5cd938fd0853fc14d9a68e85c7e8b9d2c4b2807b 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -1,9 +1,20 @@
 /*
-  interval.tcc -- implement Interval_t
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
+  Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.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/>.
 */
 
 #ifndef INTERVAL_TCC
@@ -105,15 +116,15 @@ Interval_t<T>::intersect (Interval_t<T> h)
 }
 
 template<class T>
-std::string
+string
 Interval_t<T>::to_string () const
 {
   if (is_empty ())
     return "[empty]";
-  std::string s ("[");
+  string s ("[");
 
-  return (s + T_to_string (at (LEFT)) + std::string (",")
-         + T_to_string (at (RIGHT)) + std::string ("]"));
+  return (s + T_to_string (at (LEFT)) + string (",")
+         + T_to_string (at (RIGHT)) + string ("]"));
 }
 
 template<class T>