release: 0.0.13

[lilypond.git] / flower / compare.hh

diff --git a/flower/compare.hh b/flower/compare.hh
index 47c7101c87cb9b65029b8dd4874194a836e4375c..df278a2bfbc30b193b2cf0eec265729a4fb9061b 100644 (file)
--- a/flower/compare.hh
+++ b/flower/compare.hh
@@ -1,13 +1,41 @@
+/*
+  flowerlib
+
+  (c) 1996 Han-Wen Nienhuys
+  */
 #ifndef COMPARE_HH
 #define COMPARE_HH
 
+#define one_operator(type, function, op) \
+inline bool \
+operator op (type t1, type t2) {\
+    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;\
+}\
+
+#ifdef __GNUC__
+#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
-#define template_instantiate_compare(type, function, prefix)                           \
-prefix inline bool operator>(type t1, type t2) { return function(t1, t2) > 0; }        \
-prefix inline bool operator>=(type t1, type t2) { return function(t1, t2) >= 0; }      \
-prefix inline bool operator==(type t1, type t2) { return function(t1, t2) == 0; }      \
-prefix inline bool operator<=(type t1, type t2) { return function(t1, t2) <= 0; }      \
-prefix inline bool operator<(type t1, type t2) { return function(t1, t2) < 0; } \
+#define template_instantiate_compare(type, function, prefix) \
+prefix one_operator(type, function, >)\
+prefix one_operator(type, function, >=)\
+prefix one_operator(type, function, ==)\
+prefix one_operator(type, function, !=)\
+prefix one_operator(type, function, <)\
+prefix one_operator(type, function, <=)\
+gpp_minmax(type, prefix)\
 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; }\
   \