Fixed min/max macro problem in MS VC++

diff --git a/cds/os/win/thread.h b/cds/os/win/thread.h
index dfb8be52f674ea3a4c75192f44535c57f6ccf3ab..f495e01cf00a4481f0ebb47d087a05125cb0c5c9 100644 (file)
--- 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 <windows.h>
 
 namespace cds { namespace OS {

diff --git a/cds/os/win/timer.h b/cds/os/win/timer.h
index a23f7353b062f547243f486ad0aaf1de8e521a2d..637203e1eb1e5f96dd0ec0837f6dba79de05c151 100644 (file)
--- a/cds/os/win/timer.h
+++ b/cds/os/win/timer.h
@@ -7,6 +7,7 @@
 #   error "<cds/os/timer.h> must be included"
 #endif
 
+#define NOMINMAX
 #include <windows.h>
 
 //@cond none

diff --git a/cds/os/win/topology.h b/cds/os/win/topology.h
index 34df81880c25bd908a2e2fc9f2b1c076d752d700..e427cc8acda85ba1f9bbbc73c7592ed607d0c981 100644 (file)
--- a/cds/os/win/topology.h
+++ b/cds/os/win/topology.h
@@ -8,6 +8,7 @@
 #endif
 
 #include <cds/details/defs.h>
+#define NOMINMAX
 #include <windows.h>
 
 namespace cds { namespace OS {

diff --git a/tests/unit/lock/win32_lock.h b/tests/unit/lock/win32_lock.h
index 760924b6dedaee7d04d0204f01976950e7313e2c..8bc0491deab907f80c23a157088c97f399536ce6 100644 (file)
--- 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 <windows.h>
 
 #define UNIT_LOCK_WIN_CS