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 #393

Merged
merged 1 commit into from
Feb 8, 2022

Conversation

alliepiper
Copy link
Collaborator

No description provided.

@alliepiper alliepiper added P2: nice to have Desired, but not necessary. only: tests Changes to tests only. labels Oct 25, 2021
@alliepiper alliepiper added this to the 1.16.0 milestone Oct 25, 2021
@alliepiper alliepiper self-assigned this 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.

Copy link
Collaborator

@gevtushenko gevtushenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. There's one cleaning-up suggestion which we can address later.

test/half.h Show resolved Hide resolved
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 changed the title Enable header checks for min/max macros. Fix some min/max macro collisions with windows.h Feb 7, 2022
@alliepiper alliepiper marked this pull request as ready for review February 7, 2022 20:19
@alliepiper
Copy link
Collaborator Author

Testing in NVIDIA/thrust#1552.

@alliepiper alliepiper merged commit 6261346 into NVIDIA:main Feb 8, 2022
@alliepiper alliepiper deleted the enable_min_max_tests branch February 8, 2022 16:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
only: tests Changes to tests only. P2: nice to have Desired, but not necessary.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants