*** empty log message ***

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

diff --git a/flower/include/real.hh b/flower/include/real.hh
index 2e8b160a22d02e71f0cbdc8c07e8515d07ef273d..ce7a0e0a857f54ab561e799576bbe9ca4938c008 100644 (file)
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,13 +11,38 @@
 #define REAL_HH
 
 
-#include <builtin.h>
-#include <minmax.h>
-#include <math.h>
-#include <limits.h>
+#include <climits>
 
 typedef double Real;
-const Real infinity_f = HUGE_VAL;
+extern const Real infinity_f;
+
+template<class T> inline T abs (T x)
+{
+  return x > 0 ? x : -x;
+}
+
+template<class T> inline int sign (T x)
+{
+  if (x)
+    return x > T (0) ? 1 : -1;
+  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)