From 83da7c3469c8585890bd2b23e5cdc41ad563fc1a Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 20 Feb 2020 22:57:38 +0100 Subject: [PATCH] Put NOMINMAX just before inclusion of windows.h header --- include/indicators/block_progress_bar.hpp | 1 - include/indicators/progress_bar.hpp | 1 - include/indicators/progress_spinner.hpp | 1 - include/indicators/termcolor.hpp | 3 +++ single_include/indicators/indicators.hpp | 4 +++- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/indicators/block_progress_bar.hpp b/include/indicators/block_progress_bar.hpp index ca35042..3857320 100644 --- a/include/indicators/block_progress_bar.hpp +++ b/include/indicators/block_progress_bar.hpp @@ -29,7 +29,6 @@ SOFTWARE. #include #include -#define NOMINMAX #include #include #include diff --git a/include/indicators/progress_bar.hpp b/include/indicators/progress_bar.hpp index 02cceb9..7235f54 100644 --- a/include/indicators/progress_bar.hpp +++ b/include/indicators/progress_bar.hpp @@ -28,7 +28,6 @@ SOFTWARE. #include -#define NOMINMAX #include #include #include diff --git a/include/indicators/progress_spinner.hpp b/include/indicators/progress_spinner.hpp index c39ec5c..9a4d7c2 100644 --- a/include/indicators/progress_spinner.hpp +++ b/include/indicators/progress_spinner.hpp @@ -28,7 +28,6 @@ SOFTWARE. #include -#define NOMINMAX #include #include #include diff --git a/include/indicators/termcolor.hpp b/include/indicators/termcolor.hpp index c2eda0d..a0238a4 100644 --- a/include/indicators/termcolor.hpp +++ b/include/indicators/termcolor.hpp @@ -32,6 +32,9 @@ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX) #include #elif defined(TERMCOLOR_OS_WINDOWS) +#if !defined(NOMINMAX) +#define NOMINMAX +#endif #include #include #endif diff --git a/single_include/indicators/indicators.hpp b/single_include/indicators/indicators.hpp index 777fc4e..42453cb 100644 --- a/single_include/indicators/indicators.hpp +++ b/single_include/indicators/indicators.hpp @@ -46,7 +46,6 @@ SOFTWARE. #include #include #include -#define NOMINMAX namespace indicators { enum class Color { grey, red, green, yellow, blue, magenta, cyan, white }; @@ -86,6 +85,9 @@ enum class Color { grey, red, green, yellow, blue, magenta, cyan, white }; #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX) #include #elif defined(TERMCOLOR_OS_WINDOWS) +#if !defined(NOMINMAX) +#define NOMINMAX +#endif #include #include #endif