Skip to content

Fix an issue in the special snowflake windows version of the STL#4294

Merged
barcharcraz merged 3 commits intomicrosoft:mainfrom
barcharcraz:dev/chbarto/mtx_internal_t_fix
Jan 5, 2024
Merged

Fix an issue in the special snowflake windows version of the STL#4294
barcharcraz merged 3 commits intomicrosoft:mainfrom
barcharcraz:dev/chbarto/mtx_internal_t_fix

Conversation

@barcharcraz
Copy link
Contributor

@barcharcraz barcharcraz commented Jan 4, 2024

We change the size of critical sections based on _CRT_WINDOWS, but that macro is defined at build time only, and the size is relevant in our headers. We need to change the size based on UNDOCKED_WINDOWS_UCRT as well, which is defined in consumers.

I've added a pragma detect mismatch as well, but as its own commit. If we don't want it we don't have to accept that commit.

Charlie Barto added 2 commits January 3, 2024 16:19
@barcharcraz barcharcraz requested a review from a team as a code owner January 4, 2024 00:29
CaseyCarter
CaseyCarter previously requested changes Jan 4, 2024
View reviewed changes
@CaseyCarter CaseyCarter added bug Something isn't working high priority Important! labels Jan 4, 2024
@CaseyCarter
Copy link
Contributor

CaseyCarter commented Jan 4, 2024

The build is failing with "C4384: pragma detect_mismatch should should only be used at global scope" which seems bogus to me. I suggest that you suppress the warning, verify that the detect_mismatch is correctly emitted into object files, and report the bogus warning to the compiler folks. Failing that, I suppose we'll have to have a separate conditional outside of the class scope just for the detect_mismatch.

@barcharcraz
Copy link
Contributor Author

barcharcraz commented Jan 5, 2024

The build is failing with "C4384: pragma detect_mismatch should should only be used at global scope" which seems bogus to me. I suggest that you suppress the warning, verify that the detect_mismatch is correctly emitted into object files, and report the bogus warning to the compiler folks. Failing that, I suppose we'll have to have a separate conditional outside of the class scope just for the detect_mismatch.

eagh, it is a bit shifty to have pragma detect mismatch in the middle of a class definition, I'll just move it

@barcharcraz barcharcraz dismissed CaseyCarter’s stale review January 5, 2024 23:21

STL reviewed this and casey's comments were addressed

@barcharcraz barcharcraz merged commit b84bf09 into microsoft:main Jan 5, 2024
@StephanTLavavej StephanTLavavej mentioned this pull request Jan 8, 2024
Merged
@StephanTLavavej StephanTLavavej mentioned this pull request Mar 31, 2024
Merged
@StephanTLavavej StephanTLavavej mentioned this pull request Oct 21, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@StephanTLavavej StephanTLavavej StephanTLavavej approved these changes

@CaseyCarter CaseyCarter Awaiting requested review from CaseyCarter

Assignees

No one assigned

Labels

bug Something isn't working high priority Important!

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@barcharcraz @CaseyCarter @StephanTLavavej