release: 0.0.13

[lilypond.git] / flower / compare.hh

diff --git a/flower/compare.hh b/flower/compare.hh
index 9f9d4e5906aa062cf61ad087a8938a981e9fdeea..df278a2bfbc30b193b2cf0eec265729a4fb9061b 100644 (file)
--- a/flower/compare.hh
+++ b/flower/compare.hh
@@ -6,18 +6,36 @@
 #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 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)                           \
+#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; }\
   \