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 constraints on from_json(CompatibleArrayType) #969

Merged
merged 1 commit into from
Feb 12, 2018

Conversation

theodelrieu
Copy link
Contributor

@theodelrieu theodelrieu commented Feb 12, 2018

Fixes #924

The constraints on that overload were incorrect. We were checking that the Array::value_type could be converted to json, which makes no sense.

Surprising that no one had this issue before, I guess everybody converts from and to json...

Anyway, it should not happen from now.


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 Feb 12, 2018

Coverage Status

Coverage remained the same at 100.0% when pulling 01d6118 on theodelrieu:fix/924 into b02e3bb 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 self-assigned this Feb 12, 2018
@nlohmann nlohmann added this to the Release 3.1.1 milestone Feb 12, 2018
@nlohmann nlohmann merged commit 20b5f4d into nlohmann:develop Feb 12, 2018
@nlohmann
Copy link
Owner

Thanks a lot!

@theodelrieu theodelrieu deleted the fix/924 branch February 12, 2018 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants