Skip to content
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

Jump to bottom

[BugFix] Add parentheses around std::min #626

Merged
merged 1 commit into from
Jun 17, 2017
Merged

[BugFix] Add parentheses around std::min #626

merged 1 commit into from
Jun 17, 2017

Conversation

koemeet
Copy link
Contributor

@koemeet koemeet commented Jun 17, 2017 •
edited
Loading

Add parentheses around std::min so it bypasses the macro introduced by windows.h. This fixes issues in Visual Studio 2017.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 99.722% when pulling 04a1666 on koemeet:bugfix/vs2017-min-macro-fix into 1fbb82d on nlohmann:develop.

@nlohmann nlohmann added the platform: visual studio related to MSVC label Jun 17, 2017
nlohmann
nlohmann approved these changes Jun 17, 2017
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

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

It's sad that such hacks are required to make MSVC happy...

@nlohmann nlohmann added this to the Release 3.0.0 milestone Jun 17, 2017
@nlohmann nlohmann self-assigned this Jun 17, 2017
@nlohmann nlohmann merged commit 7b97100 into nlohmann:develop Jun 17, 2017
nlohmann added a commit that referenced this pull request Jun 17, 2017
@nlohmann
📝 update after #626
b79a1a2
@koemeet koemeet deleted the bugfix/vs2017-min-macro-fix branch June 18, 2017 00:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlohmann nlohmann nlohmann approved these changes

Assignees

@nlohmann nlohmann

Labels
platform: visual studio related to MSVC
Projects
None yet
Milestone
Release 3.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@koemeet @coveralls @nlohmann