From 84eef99eaa77889603c68a0f2b92f9b4ec59cafc Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 16 Feb 2021 14:22:25 +0000 Subject: [PATCH] MinGW std::thread: suppress redundancy warning for non-debug builds See: #216 --- src/3rdparty/mingw-std-threads/mingw.condition_variable.h | 2 +- src/3rdparty/mingw-std-threads/mingw.mutex.h | 2 +- src/3rdparty/mingw-std-threads/mingw.shared_mutex.h | 2 +- src/3rdparty/mingw-std-threads/mingw.thread.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/3rdparty/mingw-std-threads/mingw.condition_variable.h b/src/3rdparty/mingw-std-threads/mingw.condition_variable.h index 4f7df18129..8791fd17b3 100644 --- a/src/3rdparty/mingw-std-threads/mingw.condition_variable.h +++ b/src/3rdparty/mingw-std-threads/mingw.condition_variable.h @@ -536,7 +536,7 @@ namespace std using mingw_stdthread::cv_status; using mingw_stdthread::condition_variable; using mingw_stdthread::condition_variable_any; -#elif !defined(MINGW_STDTHREAD_REDUNDANCY_WARNING) // Skip repetition +#elif !defined(MINGW_STDTHREAD_REDUNDANCY_WARNING) && defined(_DEBUG) // Skip repetition #define MINGW_STDTHREAD_REDUNDANCY_WARNING #pragma message "This version of MinGW seems to include a win32 port of\ pthreads, and probably already has C++11 std threading classes implemented,\ diff --git a/src/3rdparty/mingw-std-threads/mingw.mutex.h b/src/3rdparty/mingw-std-threads/mingw.mutex.h index b97314c75c..b1993809b9 100644 --- a/src/3rdparty/mingw-std-threads/mingw.mutex.h +++ b/src/3rdparty/mingw-std-threads/mingw.mutex.h @@ -461,7 +461,7 @@ using mingw_stdthread::recursive_timed_mutex; using mingw_stdthread::timed_mutex; using mingw_stdthread::once_flag; using mingw_stdthread::call_once; -#elif !defined(MINGW_STDTHREAD_REDUNDANCY_WARNING) // Skip repetition +#elif !defined(MINGW_STDTHREAD_REDUNDANCY_WARNING) && defined(_DEBUG) // Skip repetition #define MINGW_STDTHREAD_REDUNDANCY_WARNING #pragma message "This version of MinGW seems to include a win32 port of\ pthreads, and probably already has C++11 std threading classes implemented,\ diff --git a/src/3rdparty/mingw-std-threads/mingw.shared_mutex.h b/src/3rdparty/mingw-std-threads/mingw.shared_mutex.h index 4e26be82ec..896da13f95 100644 --- a/src/3rdparty/mingw-std-threads/mingw.shared_mutex.h +++ b/src/3rdparty/mingw-std-threads/mingw.shared_mutex.h @@ -484,7 +484,7 @@ using mingw_stdthread::shared_mutex; #if (__cplusplus < 201402L) || (defined(__MINGW32__ ) && !defined(_GLIBCXX_HAS_GTHREADS)) using mingw_stdthread::shared_timed_mutex; using mingw_stdthread::shared_lock; -#elif !defined(MINGW_STDTHREAD_REDUNDANCY_WARNING) // Skip repetition +#elif !defined(MINGW_STDTHREAD_REDUNDANCY_WARNING) && defined(_DEBUG) // Skip repetition #define MINGW_STDTHREAD_REDUNDANCY_WARNING #pragma message "This version of MinGW seems to include a win32 port of\ pthreads, and probably already has C++ std threading classes implemented,\ diff --git a/src/3rdparty/mingw-std-threads/mingw.thread.h b/src/3rdparty/mingw-std-threads/mingw.thread.h index 2d01f28074..137483d6e0 100644 --- a/src/3rdparty/mingw-std-threads/mingw.thread.h +++ b/src/3rdparty/mingw-std-threads/mingw.thread.h @@ -384,7 +384,7 @@ namespace this_thread { using namespace mingw_stdthread::this_thread; } -#elif !defined(MINGW_STDTHREAD_REDUNDANCY_WARNING) // Skip repetition +#elif !defined(MINGW_STDTHREAD_REDUNDANCY_WARNING) && defined(_DEBUG) // Skip repetition #define MINGW_STDTHREAD_REDUNDANCY_WARNING #pragma message "This version of MinGW seems to include a win32 port of\ pthreads, and probably already has C++11 std threading classes implemented,\