Imported Upstream version 2.19.45

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

diff --git a/flower/include/compare.hh b/flower/include/compare.hh
index 9822526e037dc001d00d66d021894da178dcb56f..0ec1173951590cae858e21b6c3fb2a4859bf4ded 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--2012 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
@@ -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)