Run grand replace for 2015.

[lilypond.git] / flower / include / compare.hh

diff --git a/flower/include/compare.hh b/flower/include/compare.hh
index cb4cbf3d17f816b923a9319c09c2f110903302e0..0b398aa18c86e441166e9c4439cbefdefd9907dc 100644 (file)
--- 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--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
@@ -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,)