Don't redefine NOMINMAX (clean up MinGW warnings)

2016-02-05 13:35:15 -06:00
parent ef2e6079ba
commit 5c16357fe2
7 changed files with 8 additions and 7 deletions
--- a/src/factory/FieldCreateFactory.cpp
+++ b/src/factory/FieldCreateFactory.cpp
@@ -8,7 +8,7 @@
 *  @author mrk
 */

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

--- a/src/factory/PVDataCreateFactory.cpp
+++ b/src/factory/PVDataCreateFactory.cpp
@@ -8,7 +8,7 @@
 *  @author mrk
 */

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

--- a/src/misc/pv/epicsException.h
+++ b/src/misc/pv/epicsException.h
@@ -34,7 +34,8 @@
 #ifndef EPICSEXCEPTION_H_
 #define EPICSEXCEPTION_H_

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

 #include <stdexcept>
--- a/src/misc/pv/sharedVector.h
+++ b/src/misc/pv/sharedVector.h
@@ -7,7 +7,7 @@
 #ifndef SHAREDVECTOR_H
 #define SHAREDVECTOR_H

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

--- a/src/misc/timer.cpp
+++ b/src/misc/timer.cpp
@@ -8,7 +8,7 @@
 *  @author mrk
 */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif

--- a/src/pv/pvData.h
+++ b/src/pv/pvData.h
@@ -10,7 +10,7 @@
 #ifndef PVDATA_H
 #define PVDATA_H

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

--- a/src/pv/pvType.h
+++ b/src/pv/pvType.h
@@ -15,7 +15,7 @@
 #ifndef PVTYPE_H
 #define PVTYPE_H

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