X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fcompare.hh;h=f2cff8a80f11ee4a1a03f0b9c68e60e5045321da;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=37e01f46eea3078ac6af4d99328e6beffa35bdc8;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/flower/include/compare.hh b/flower/include/compare.hh
index 37e01f46ee..f2cff8a80f 100644
--- a/flower/include/compare.hh
+++ b/flower/include/compare.hh
@@ -1,7 +1,7 @@
 /*
   flowerlib
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  (c) 1996--2007 Han-Wen Nienhuys
 */
 #ifndef COMPARE_HH
 #define COMPARE_HH
@@ -13,21 +13,6 @@
     return function (t1, t2) op 0;		\
   }
 
-#define GPP_MINMAX_OPERATOR(type, op, opp)	\
-  inline type					\
-  operator op (type t1, type t2)		\
-  {						\
-    return (t1 opp t2) ? t1 : t2;		\
-  }
-
-#if defined (__GNUG__) && ! defined (__STRICT_ANSI__)
-#define GPP_MINMAX(type, prefix)		\
-  prefix GPP_MINMAX_OPERATOR (type, <?, <)	\
-    prefix GPP_MINMAX_OPERATOR (type, >?, >)
-#else
-#define GPP_MINMAX (type, prefix)
-#endif
-
 /**  handy notations for a signed comparison.
      make the operators{<,<=,==,>=,>} and the MAX and MIN of two.
      Please fill a & in the type argument if necessary.
@@ -39,11 +24,12 @@
     prefix ONE_OPERATOR (type, function, !=)				\
     prefix ONE_OPERATOR (type, function, <)				\
     prefix ONE_OPERATOR (type, function, <=)				\
-    GPP_MINMAX (type, prefix)						\
+    /* namespace std { */						\
     prefix inline type max (type t1, type t2) { return (t1 > t2) ? t1 : t2; } \
-  prefix inline type min (type t1, type t2) { return (t1 < t2) ? t1 : t2; } \
-									\
-  prefix bool operator < (type t1, type t2) /* stupid fix to allow ; */
+    prefix inline type min (type t1, type t2) { return (t1 < t2) ? t1 : t2; } \
+  /* } */								\
+  /* stupid fix to allow ; */						\
+  prefix bool operator < (type t1, type t2)
 
 #define INSTANTIATE_COMPARE(type, func) TEMPLATE_INSTANTIATE_COMPARE (type, func,)