From 9928ffece93a1a53cae9378d8794f867962e56be Mon Sep 17 00:00:00 2001 From: khizmax Date: Fri, 24 Apr 2015 22:24:06 +0300 Subject: [PATCH] Fixed min/max macro problem in MS VC++ --- cds/os/win/thread.h | 1 + cds/os/win/timer.h | 1 + cds/os/win/topology.h | 1 + tests/unit/lock/win32_lock.h | 1 + 4 files changed, 4 insertions(+) diff --git a/cds/os/win/thread.h b/cds/os/win/thread.h index dfb8be52..f495e01c 100644 --- a/cds/os/win/thread.h +++ b/cds/os/win/thread.h @@ -3,6 +3,7 @@ #ifndef CDSLIB_OS_WIN_THREAD_H #define CDSLIB_OS_WIN_THREAD_H +#define NOMINMAX #include namespace cds { namespace OS { diff --git a/cds/os/win/timer.h b/cds/os/win/timer.h index a23f7353..637203e1 100644 --- a/cds/os/win/timer.h +++ b/cds/os/win/timer.h @@ -7,6 +7,7 @@ # error " must be included" #endif +#define NOMINMAX #include //@cond none diff --git a/cds/os/win/topology.h b/cds/os/win/topology.h index 34df8188..e427cc8a 100644 --- a/cds/os/win/topology.h +++ b/cds/os/win/topology.h @@ -8,6 +8,7 @@ #endif #include +#define NOMINMAX #include namespace cds { namespace OS { diff --git a/tests/unit/lock/win32_lock.h b/tests/unit/lock/win32_lock.h index 760924b6..8bc0491d 100644 --- a/tests/unit/lock/win32_lock.h +++ b/tests/unit/lock/win32_lock.h @@ -4,6 +4,7 @@ #define CDSUNIT_LOCK_WIN32_LOCK_H #if defined(_WIN32) || defined(_WIN64) +#define NOMINMAX #include #define UNIT_LOCK_WIN_CS -- 2.34.1