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

Fix issue #1237 #1238

Merged
merged 2 commits into from
Sep 29, 2018
Merged

Fix issue #1237 #1238

merged 2 commits into from
Sep 29, 2018

Conversation

theodelrieu
Copy link
Contributor

@theodelrieu theodelrieu commented Sep 12, 2018 •
edited
Loading

  • Make the conversion operator SFINAE correct.
  • Workaround a GCC bug with some traits in type_traits.hpp

Fixes #1237

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.

@coveralls
Copy link

coveralls commented Sep 12, 2018 •
edited
Loading

Coverage Status

Coverage remained the same at 100.0% when pulling 4e52277 on theodelrieu:fix/1237 into e4bc98d on nlohmann:develop.

@theodelrieu theodelrieu mentioned this pull request Sep 13, 2018
Merged
4 tasks
@nlohmann
Copy link
Owner

@theodelrieu Do we need to add documentation for this? Like: a README entry to an example like the programs in doc/examples?

@nlohmann nlohmann mentioned this pull request Sep 17, 2018
Closed
@theodelrieu
Copy link
Contributor Author

I don't think so, this is a fix more than a feature. It would be nice to add an example for #1231 though

@theodelrieu
Fix issue nlohmann#1237
4e52277 
* Make the conversion operator SFINAE correct.
* Workaround a GCC bug with some traits in type_traits.hpp

The first bullet-point implies that every `get`/`get_ptr` be SFINAE
correct as well.
nlohmann
nlohmann approved these changes Sep 29, 2018
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.

Looks good to me.

@nlohmann nlohmann self-assigned this Sep 29, 2018
@nlohmann nlohmann added this to the Release 3.2.1 milestone Sep 29, 2018
@nlohmann nlohmann merged commit 910a895 into nlohmann:develop Sep 29, 2018
@nlohmann
Copy link
Owner

Thanks a lot!

@theodelrieu theodelrieu deleted the fix/1237 branch October 1, 2018 13:54
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
None yet
Projects
None yet
Milestone
Release 3.3.0
Development

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