Merge with master

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

diff --git a/flower/include/real.hh b/flower/include/real.hh
index e00c2880e3df39b4314d03197c796a717fd2f30f..2185d9b46b81ee6eaece34d71bc9f817646d613d 100644 (file)
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -3,24 +3,41 @@
 
   source file of the Flower Library
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef REAL_HH
 #define REAL_HH
 
+#include <algorithm>
+#include <climits>
+
+/*
+  MacOS 10.3 uses g++ 3.3 which doesn't have isinf()
+ */
+// #include <cmath>
+#include <math.h>
+using namespace std;
 
-#include <limits.h>
 
 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)
@@ -28,26 +45,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