From: Sage Weil <sage@redhat.com>
Date: Wed, 14 Mar 2018 02:16:42 +0000 (-0500)
Subject: include: kill MIN and MAX macros
X-Git-Tag: v13.1.0~561^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20886%2Fhead;p=ceph.git

include: kill MIN and MAX macros

Use std::min and std::max instead.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/include/intarith.h b/src/include/intarith.h
index d0e33a339b82..b2fb849db310 100644
--- a/src/include/intarith.h
+++ b/src/include/intarith.h
@@ -17,14 +17,6 @@
 
 #include <type_traits>
 
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a):(b))
-#endif
-
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a):(b))
-#endif
-
 #ifndef DIV_ROUND_UP
 #define DIV_ROUND_UP(n, d)  (((n) + (d) - 1) / (d))
 #endif
diff --git a/src/include/interval_set.h b/src/include/interval_set.h
index 4fcd60eb0658..14f9ba82e726 100644
--- a/src/include/interval_set.h
+++ b/src/include/interval_set.h
@@ -30,14 +30,6 @@
  * flat_map and btree_map).
  */
 
-#ifndef MIN
-# define MIN(a,b)  ((a)<=(b) ? (a):(b))
-#endif
-#ifndef MAX
-# define MAX(a,b)  ((a)>=(b) ? (a):(b))
-#endif
-
-
 template<typename T, typename Map = std::map<T,T>>
 class interval_set {
  public: