From 548b58f44f657d1ef264737f1c7b7319922ddef2 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Mon, 8 Jan 2024 11:51:04 -0800 Subject: [PATCH] Drop `#pragma detect_mismatch` for `mutex` size. Followup to GH 4294. --- stl/inc/xthreads.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/stl/inc/xthreads.h b/stl/inc/xthreads.h index e0c05e459c5..984bd75087a 100644 --- a/stl/inc/xthreads.h +++ b/stl/inc/xthreads.h @@ -32,12 +32,6 @@ struct _Stl_critical_section { _Smtx_t _M_srw_lock = nullptr; }; -#if defined(_CRT_WINDOWS) || defined(UNDOCKED_WINDOWS_UCRT) -#pragma detect_mismatch("windows_mutex", "1") -#else // ^^^ Windows private STL / public STL vvv -#pragma detect_mismatch("windows_mutex", "0") -#endif // ^^^ public STL ^^^ - struct _Mtx_internal_imp_t { #if defined(_CRT_WINDOWS) || defined(UNDOCKED_WINDOWS_UCRT) #ifdef _WIN64 @@ -53,7 +47,6 @@ struct _Mtx_internal_imp_t { #endif // ^^^ !defined(_WIN64) ^^^ #endif // ^^^ public STL ^^^ - static constexpr size_t _Critical_section_align = alignof(void*); int _Type{};