X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fcompare.hh;h=0ec1173951590cae858e21b6c3fb2a4859bf4ded;hb=8211950f0931c4d8a0e18ee9e436e489bd583dbd;hp=0b398aa18c86e441166e9c4439cbefdefd9907dc;hpb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;p=lilypond.git diff --git a/flower/include/compare.hh b/flower/include/compare.hh index 0b398aa18c..0ec1173951 100644 --- a/flower/include/compare.hh +++ b/flower/include/compare.hh @@ -37,10 +37,6 @@ prefix ONE_OPERATOR (type, function, !=) \ prefix ONE_OPERATOR (type, function, <) \ prefix ONE_OPERATOR (type, function, <=) \ - /* 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; } \ - /* } */ \ /* stupid fix to allow ; */ \ prefix bool operator < (type t1, type t2)