Merge with master

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

diff --git a/flower/include/real.hh b/flower/include/real.hh
index 8a62bbceb92f5f93372155cfddb413a841886e12..2185d9b46b81ee6eaece34d71bc9f817646d613d 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--2007 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 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)
@@ -28,17 +45,9 @@ template<class T> inline int sign (T x)
   return 0;
 }
 
-
 template<class T> inline T sqr (T x)
 {
   return x * x;
 }
 
-
-inline Real
-distance (Real x, Real y)
-{
-  return abs (x - y);
-}
-
 #endif