Run grand-replace (issue 3765)

[lilypond.git] / flower / include / real.hh

diff --git a/flower/include/real.hh b/flower/include/real.hh
index 43a35179a655d9f117f28ba822263af1912dc6ff..7345079680082673f73bb85760384ea6c3d3adf1 100644 (file)
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -1,24 +1,48 @@
 /*
-  real.hh -- declare Real
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 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/>.
 */
 
 #ifndef REAL_HH
 #define REAL_HH
 
+#include <algorithm>
 #include <climits>
+#include <cmath>
+using namespace std;
 
 typedef double Real;
 extern const Real infinity_f;
 
+/* namespace std { */
+
 template<class T> inline T abs (T x)
 {
   return x > 0 ? x : -x;
 }
 
+/* } namespace std */
+
+inline Real
+distance (Real x, Real y)
+{
+  return abs (x - y);
+}
+
 template<class T> inline int sign (T x)
 {
   if (x)
@@ -26,25 +50,9 @@ template<class T> inline int sign (T x)
   return 0;
 }
 
-template<class T> inline T max (T x, T y)
-{
-  return x >? y;
-}
-
 template<class T> inline T sqr (T x)
 {
-  return x*x;
-}
-
-template<class T> inline T min (T x, T y)
-{
-  return x <? y;
-}
-
-inline Real
-distance (Real x, Real y)
-{
-  return abs (x - y);
+  return x * x;
 }
 
 #endif