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 assertion failure for JSON_DIAGNOSTICS #3037

Merged
merged 2 commits into from
Oct 7, 2021

Conversation

carlsmedstad
Copy link
Contributor

@carlsmedstad carlsmedstad commented Sep 27, 2021

Decided to give it a go. Not super well-versed in template programming and such but this does at least pass my test case.

Resolves #3032.


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.

@carlsmedstad carlsmedstad changed the title Fix assertion failure for JSON_DIAGNOSTICS #3032 Fix assertion failure for JSON_DIAGNOSTICS Sep 27, 2021
@coveralls
Copy link

coveralls commented Sep 27, 2021

Coverage Status

Coverage remained the same at 100.0% when pulling 80688bd on carlsmedstad:issue3032 into 0b345b2 on nlohmann:develop.

include/nlohmann/json.hpp Show resolved Hide resolved
@carlsmedstad
Copy link
Contributor Author

Was there something more you wanted me to do on this before merging, @nlohmann?

@nlohmann
Copy link
Owner

I'll check tomorrow.

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 self-assigned this Oct 7, 2021
@nlohmann nlohmann added this to the Release 3.10.3 milestone Oct 7, 2021
@nlohmann nlohmann merged commit 62f2997 into nlohmann:develop Oct 7, 2021
@nlohmann
Copy link
Owner

nlohmann commented Oct 7, 2021

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants