Skip to content

Drop #pragma detect_mismatch for mutex size #4301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stephan T. Lavavej (StephanTLavavej) merged 1 commit into from
Jan 9, 2024
Merged

Drop #pragma detect_mismatch for mutex size #4301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions stl/inc/xthreads.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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{};
Expand Down