From: khizmax <libcds.dev@gmail.com>
Date: Fri, 24 Apr 2015 19:24:06 +0000 (+0300)
Subject: Fixed min/max macro problem in MS VC++
X-Git-Tag: v2.1.0~245^2~14
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a565eea2b2f9d311820c1d516048d06c066e6664;p=libcds.git

Fixed min/max macro problem in MS VC++
---

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 <windows.h>
 
 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 "<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 34df8188..e427cc8a 100644
--- 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 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 <windows.h>
 
 #define UNIT_LOCK_WIN_CS