Prevent redefinition of NOMINMAX

While this protection is not strictly necessary here, if someone does a cut-and-paste into a header file it should be included.
2016-04-06 15:29:30 -05:00
parent 8d7f534d54
commit 2ee8769752
3 changed files with 3 additions and 3 deletions
--- a/testApp/misc/testBitSet.cpp
+++ b/testApp/misc/testBitSet.cpp
@@ -6,7 +6,7 @@
 */
 /* Author:  Matej Sekoranja Date: 2010.10.18 */

-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif

--- a/testApp/misc/testSerialization.cpp
+++ b/testApp/misc/testSerialization.cpp
@@ -10,7 +10,7 @@
 *      Author: Miha Vitorovic
 */

-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif

--- a/testApp/misc/testTypeCast.cpp
+++ b/testApp/misc/testTypeCast.cpp
@@ -5,7 +5,7 @@
 */
 /* Author:  Michael Davidsaver */

-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif