X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fcompare.hh;h=0ec1173951590cae858e21b6c3fb2a4859bf4ded;hb=0041871ea33b9e937e14f2fb97a32a759c7404ce;hp=febadd3d551d3537951efa25de7bcbd62c9b0915;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git

diff --git a/flower/include/compare.hh b/flower/include/compare.hh
index febadd3d55..0ec1173951 100644
--- a/flower/include/compare.hh
+++ b/flower/include/compare.hh
@@ -1,34 +1,43 @@
 /*
-  flowerlib
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2009 Han-Wen Nienhuys
+  Copyright (C) 1996--2015 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 #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 { */						\
-    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 ; */						\
+#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, <=)                            \
+  /* stupid fix to allow ; */                                           \
   prefix bool operator < (type t1, type t2)
 
 #define INSTANTIATE_COMPARE(type, func) TEMPLATE_INSTANTIATE_COMPARE (type, func,)