From f3bbb98e7177864149072a18cd3d4b7845efdc16 Mon Sep 17 00:00:00 2001 From: Alex Guteniev Date: Wed, 12 Aug 2020 22:52:23 +0300 Subject: [PATCH] Move _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE (#1179) --- stl/inc/yvals.h | 16 ---------------- stl/src/atomic_wait.cpp | 8 ++++++++ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/stl/inc/yvals.h b/stl/inc/yvals.h index ea0b53f45..1a70aa17e 100644 --- a/stl/inc/yvals.h +++ b/stl/inc/yvals.h @@ -306,22 +306,6 @@ _STL_DISABLE_CLANG_WARNINGS #define _LOCK_DEBUG 3 #define _LOCK_AT_THREAD_EXIT 4 -#ifndef _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE -#if _STL_WIN32_WINNT >= _STL_WIN32_WINNT_WIN8 -#define _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE 1 -#else // ^^^ _STL_WIN32_WINNT >= _STL_WIN32_WINNT_WIN8 // _STL_WIN32_WINNT < _STL_WIN32_WINNT_WIN8 vvv -#define _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE 0 -#endif // ^^^ _STL_WIN32_WINNT < _STL_WIN32_WINNT_WIN8 ^^^ -#endif // _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE - -#ifndef _ALLOW_ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE_MISMATCH -#if _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE -#pragma detect_mismatch("_ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE", "1") -#else -#pragma detect_mismatch("_ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE", "0") -#endif -#endif // !_ALLOW_ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE_MISMATCH - #ifdef __cplusplus _STD_BEGIN enum _Uninitialized { // tag for suppressing initialization diff --git a/stl/src/atomic_wait.cpp b/stl/src/atomic_wait.cpp index d16f53f21..0a45b12ae 100644 --- a/stl/src/atomic_wait.cpp +++ b/stl/src/atomic_wait.cpp @@ -88,6 +88,14 @@ namespace { #endif // _DEBUG } +#ifndef _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE +#if _STL_WIN32_WINNT >= _STL_WIN32_WINNT_WIN8 +#define _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE 1 +#else // ^^^ _STL_WIN32_WINNT >= _STL_WIN32_WINNT_WIN8 // _STL_WIN32_WINNT < _STL_WIN32_WINNT_WIN8 vvv +#define _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE 0 +#endif // ^^^ _STL_WIN32_WINNT < _STL_WIN32_WINNT_WIN8 ^^^ +#endif // _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE + #if _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE #define __crtWaitOnAddress WaitOnAddress