* The grand 2005-2006 replace.

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

diff --git a/flower/include/real.hh b/flower/include/real.hh
index 966406f60879fef206fbf1886df12c721f24ab84..5f0fcd91ea1a1b1cde9aa18cd3ccf44d2a45f6cf 100644 (file)
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef REAL_HH
@@ -12,15 +12,32 @@
 #include <algorithm>
 #include <climits>
 
+/*
+  MacOS 10.3 uses g++ 3.3 which doesn't have std::isinf()
+ */
+// #include <cmath>
+#include <math.h>
+using namespace std;
+
+
 typedef double Real;
 extern const Real infinity_f;
-using namespace std;
 
+/* 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)
@@ -33,10 +50,4 @@ template<class T> inline T sqr (T x)
   return x * x;
 }
 
-inline Real
-distance (Real x, Real y)
-{
-  return abs (x - y);
-}
-
 #endif