X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fcompare.hh;h=929c19d81e5a0f5ad04bae4e59684c5484c5d602;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=cb4cbf3d17f816b923a9319c09c2f110903302e0;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/flower/include/compare.hh b/flower/include/compare.hh index cb4cbf3d17..929c19d81e 100644 --- a/flower/include/compare.hh +++ b/flower/include/compare.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2011 Han-Wen Nienhuys + Copyright (C) 1996--2014 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,29 +19,29 @@ #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; \ } /** 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. */ -#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, <=) \ - /* namespace std { */ \ +#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, <=) \ + /* 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 ; */ \ + /* } */ \ + /* stupid fix to allow ; */ \ prefix bool operator < (type t1, type t2) #define INSTANTIATE_COMPARE(type, func) TEMPLATE_INSTANTIATE_COMPARE (type, func,)