Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Fix some min/max macro collisions with windows.h #1552

Merged
merged 1 commit into from
Feb 8, 2022
Merged

Fix some min/max macro collisions with windows.h #1552

merged 1 commit into from
Feb 8, 2022

Conversation

alliepiper
Copy link
Collaborator

No description provided.

@alliepiper alliepiper added the P2: nice to have Desired, but not necessary. label Oct 25, 2021
@alliepiper alliepiper added this to the 1.16.0 milestone Oct 25, 2021
@alliepiper alliepiper removed the request for review from gevtushenko October 25, 2021 22:03
@alliepiper alliepiper marked this pull request as draft October 25, 2021 22:03
@alliepiper
Copy link
Collaborator Author

Marking draft -- there are some issues with these macros I'll need to address before review.

@alliepiper alliepiper force-pushed the enable_min_max_tests branch 2 times, most recently from 7502661 to c9aa41e Compare October 26, 2021 02:59
@alliepiper
Copy link
Collaborator Author

DVS CL: 30576591

run tests

@alliepiper alliepiper force-pushed the enable_min_max_tests branch from c9aa41e to da46adc Compare October 26, 2021 15:09
@alliepiper
Copy link
Collaborator Author

DVS CL: 30579235

run tests

@alliepiper
Copy link
Collaborator Author

This may not be doable...some standard library headers are now emitting errors from their usages of min/max.

@alliepiper alliepiper force-pushed the enable_min_max_tests branch 2 times, most recently from bcb2a2d to 2f1e928 Compare February 7, 2022 20:04
@alliepiper alliepiper changed the title Enable min/max macro checks and fix all detected. Fix some min/max macro collisions with windows.h Feb 7, 2022
@alliepiper alliepiper assigned gevtushenko and unassigned gevtushenko Feb 7, 2022
@alliepiper
Copy link
Collaborator Author

Tests include NVIDIA/cub#393.

DVS:

run tests

@alliepiper alliepiper marked this pull request as ready for review February 7, 2022 20:18
@alliepiper alliepiper added testing: gpuCI in progress Started gpuCI testing. testing: internal ci in progress Currently testing on internal NVIDIA CI (DVS). labels Feb 7, 2022
@alliepiper alliepiper mentioned this pull request Feb 7, 2022
Merged
@alliepiper alliepiper added testing: gpuCI passed Passed gpuCI testing. testing: internal ci passed Passed internal NVIDIA CI (DVS). and removed testing: internal ci in progress Currently testing on internal NVIDIA CI (DVS). testing: gpuCI in progress Started gpuCI testing. labels Feb 8, 2022
@alliepiper alliepiper force-pushed the enable_min_max_tests branch from 2f1e928 to a32df53 Compare February 8, 2022 16:16
@alliepiper
Fix some windows.h collisions with min/max.
4cdde3b 
Tried adding these to the header test macro checks, but this introduced
new issues on non-msvc builds. We can revist the header tests later,
this PR just fixes the collisions.
@alliepiper alliepiper force-pushed the enable_min_max_tests branch from a32df53 to 4cdde3b Compare February 8, 2022 16:19
@alliepiper alliepiper merged commit b525fea into NVIDIA:main Feb 8, 2022
@alliepiper alliepiper deleted the enable_min_max_tests branch February 8, 2022 16:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gevtushenko gevtushenko gevtushenko approved these changes

Assignees

@alliepiper alliepiper

@gevtushenko gevtushenko

Labels
P2: nice to have Desired, but not necessary. testing: gpuCI passed Passed gpuCI testing. testing: internal ci passed Passed internal NVIDIA CI (DVS).
Projects
None yet
Milestone
1.16.0
Development

Successfully merging this pull request may close these issues.
2 participants
@alliepiper @gevtushenko