zhangyiss/indicators
1
0
Fork 0
mirror of https://github.com/p-ranav/indicators.git synced 2025-12-12 01:18:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Put NOMINMAX just before inclusion of windows.h header

Browse Source
This commit is contained in:
Anonymous Maarten
2020-02-20 22:57:38 +01:00
parent b13ff53c26
commit 83da7c3469
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/indicators/block_progress_bar.hpp
View File

@@ -29,7 +29,6 @@ SOFTWARE.
#include <indicators/color.hpp> #include <indicators/color.hpp>
#include <indicators/details/stream_helper.hpp> #include <indicators/details/stream_helper.hpp>
#define NOMINMAX
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <chrono> #include <chrono>

1
include/indicators/progress_bar.hpp
View File

@@ -28,7 +28,6 @@ SOFTWARE.
#include <indicators/details/stream_helper.hpp> #include <indicators/details/stream_helper.hpp>
#define NOMINMAX
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <chrono> #include <chrono>

1
include/indicators/progress_spinner.hpp
View File

@@ -28,7 +28,6 @@ SOFTWARE.
#include <indicators/details/stream_helper.hpp> #include <indicators/details/stream_helper.hpp>
#define NOMINMAX
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <chrono> #include <chrono>

3
include/indicators/termcolor.hpp
View File

@@ -32,6 +32,9 @@
#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX) #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
#include <unistd.h> #include <unistd.h>
#elif defined(TERMCOLOR_OS_WINDOWS) #elif defined(TERMCOLOR_OS_WINDOWS)
#if !defined(NOMINMAX)
#define NOMINMAX
#endif
#include <io.h> #include <io.h>
#include <windows.h> #include <windows.h>
#endif #endif

4
single_include/indicators/indicators.hpp
View File

@@ -46,7 +46,6 @@ SOFTWARE.
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <vector> #include <vector>
#define NOMINMAX
namespace indicators { namespace indicators {
enum class Color { grey, red, green, yellow, blue, magenta, cyan, white }; 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) #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
#include <unistd.h> #include <unistd.h>
#elif defined(TERMCOLOR_OS_WINDOWS) #elif defined(TERMCOLOR_OS_WINDOWS)
#if !defined(NOMINMAX)
#define NOMINMAX
#endif
#include <io.h> #include <io.h>
#include <windows.h> #include <windows.h>
#endif #endif