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.

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

fix _MSC_VER version to check for std::filesystem #3240

Merged
merged 1 commit into from
Jan 3, 2022

Conversation

gcerretani
Copy link
Contributor

According to

// no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support
MSVC supports std::filesystem since 19.14, (Visual Studio 2017 version 15.7) that has _MSC_VER == 1914 according to Microsoft documentation, but the check is done against a not existing value 1940 (latest Visual Studio 2022 has _MSC_VER == 1930).

I just change this value.


Pull request checklist

Read the Contribution Guidelines for detailed information.

  • Changes are described in the pull request, or an existing issue is referenced.
  • The test suite compiles and runs without error.
  • Code coverage is 100%. Test cases can be added by editing the test suite.
  • The source code is amalgamated; that is, after making changes to the sources in the include/nlohmann directory, run make amalgamate to create the single-header file single_include/nlohmann/json.hpp. The whole process is described here.

Please don't

  • The C++11 support varies between different compilers and versions. Please note the list of supported compilers. Some compilers like GCC 4.7 (and earlier), Clang 3.3 (and earlier), or Microsoft Visual Studio 13.0 and earlier are known not to work due to missing or incomplete C++11 support. Please refrain from proposing changes that work around these compiler's limitations with #ifdefs or other means.
  • Specifically, I am aware of compilation problems with Microsoft Visual Studio (there even is an issue label for these kind of bugs). I understand that even in 2016, complete C++11 support isn't there yet. But please also understand that I do not want to drop features or uglify the code just to make Microsoft's sub-standard compiler happy. The past has shown that there are ways to express the functionality such that the code compiles with the most recent MSVC - unfortunately, this is not the main objective of the project.
  • Please refrain from proposing changes that would break JSON conformance. If you propose a conformant extension of JSON to be supported by the library, please motivate this extension.
  • Please do not open pull requests that address multiple issues.

@nlohmann
Copy link
Owner

nlohmann commented Jan 3, 2022

Thanks for the PR! Looks like a copy/paste error on my side. I will happily merge this if the CI accepts it. I am not using MSVC myself...

@nlohmann nlohmann self-assigned this Jan 3, 2022
@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling dd2a42e on gcerretani:fix_filesystem_msvc into cc59ab1 on nlohmann:develop.

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.

Looks good to me.

@nlohmann nlohmann added this to the Release 3.10.6 milestone Jan 3, 2022
@nlohmann nlohmann merged commit 78ddf2b into nlohmann:develop Jan 3, 2022
@nlohmann
Copy link
Owner

nlohmann commented Jan 3, 2022

Thanks!

@gcerretani gcerretani deleted the fix_filesystem_msvc branch January 4, 2022 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants