Better way to resolve the windows.h max macro conflicts.

schlangster · schlangster · commit cdcd1370a159 · 2014-05-22T02:58:03.000+02:00
diff --git a/include/react/detail/Defs.h b/include/react/detail/Defs.h
@@ -6,15 +6,6 @@
 
 #pragma once
 
-#define NOMINMAX
-
-#ifdef max
-    #undef max
-#endif
-#ifdef min
-    #undef min
-#endif
-
 #include <cassert>
 #include <cstddef>
 
diff --git a/include/react/detail/ReactiveInput.h b/include/react/detail/ReactiveInput.h
@@ -155,8 +155,8 @@ class InputManager
     {
         auto curId = nextTurnId_.fetch_add(1, std::memory_order_relaxed);
 
-        if (curId == std::numeric_limits<int>::max())
-            nextTurnId_.fetch_sub(std::numeric_limits<int>::max());
+        if (curId == (std::numeric_limits<int>::max)())
+            nextTurnId_.fetch_sub((std::numeric_limits<int>::max)());
 
         return curId;
     }
diff --git a/include/react/detail/graph/EventNodes.h b/include/react/detail/graph/EventNodes.h
@@ -75,7 +75,7 @@ class EventStreamNode :
 
 protected:
     DataT   events_;
-    uint    curTurnId_ = std::numeric_limits<int>::max();
+    uint    curTurnId_ = (std::numeric_limits<int>::max)();
 };
 
 template <typename D, typename E>

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,8 @@ class InputManager`
`155`	`155`	`{`
`156`	`156`	`auto curId = nextTurnId_.fetch_add(1, std::memory_order_relaxed);`
`157`	`157`
`158`		`- if (curId == std::numeric_limits<int>::max())`
`159`		`- nextTurnId_.fetch_sub(std::numeric_limits<int>::max());`
	`158`	`+ if (curId == (std::numeric_limits<int>::max)())`
	`159`	`+ nextTurnId_.fetch_sub((std::numeric_limits<int>::max)());`
`160`	`160`
`161`	`161`	`return curId;`
`162`	`162`	`}`