From 9e35e73743527ea91485772c65b498d064ab1063 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 13 Mar 2018 21:16:42 -0500 Subject: [PATCH] include: kill MIN and MAX macros Use std::min and std::max instead. Signed-off-by: Sage Weil --- src/include/intarith.h | 8 -------- src/include/interval_set.h | 8 -------- 2 files changed, 16 deletions(-) diff --git a/src/include/intarith.h b/src/include/intarith.h index d0e33a339b8..b2fb849db31 100644 --- a/src/include/intarith.h +++ b/src/include/intarith.h @@ -17,14 +17,6 @@ #include -#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 4fcd60eb065..14f9ba82e72 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> class interval_set { public: -- 2.39.5