* lily/tie-column.cc (set_manual_tie_configuration): new function.

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

diff --git a/flower/include/compare.hh b/flower/include/compare.hh
index a0d7ed98fa97cd122214f02b05d1b0bd2072a0b2..891f040f489b5347dfef75a4cd1a04bc1817f1e0 100644 (file)
--- a/flower/include/compare.hh
+++ b/flower/include/compare.hh
@@ -24,10 +24,12 @@
     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; } \
-                                                                       \
-  prefix bool operator < (type t1, type t2) /* stupid fix to allow ; */
+    prefix inline type min (type t1, type t2) { return (t1 < t2) ? t1 : t2; } \
+  /* } */                                                              \
+  /* stupid fix to allow ; */                                          \
+  prefix bool operator < (type t1, type t2)
 
 #define INSTANTIATE_COMPARE(type, func) TEMPLATE_INSTANTIATE_COMPARE (type, func,)