From a334e26c7c44ed70c6938f317c9470b70e4f5f42 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sat, 30 Sep 2017 18:54:19 +0100 Subject: [PATCH] Undef min for MSVC --- src/deque.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/deque.h b/src/deque.h index 43f810ec..8aae018c 100644 --- a/src/deque.h +++ b/src/deque.h @@ -47,6 +47,10 @@ SOFTWARE. #include "type_traits.h" #include "parameter_type.h" +#ifdef ETL_COMPILER_MICROSOFT +#undef min +#endif + #undef ETL_FILE #define ETL_FILE "1" @@ -2144,4 +2148,8 @@ bool operator >=(const etl::ideque& lhs, const etl::ideque& rhs) #undef ETL_FILE +#ifdef ETL_COMPILER_MICROSOFT +#define min(a,b) (((a) < (b)) ? (a) : (b)) +#endif + #endif