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/1511 #1555

Merged
merged 3 commits into from
Apr 3, 2019
Merged

Fix/1511 #1555

merged 3 commits into from
Apr 3, 2019

Conversation

theodelrieu
Copy link
Contributor

@theodelrieu theodelrieu commented Apr 1, 2019 •
edited
Loading

This PR intends to fix #1511, by explicitly replacing the output parameter's value in from_json overloads.

Additionally, I added support for built-in arrays, which could not be returned by get, but they can be used with get_to.

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 Apr 1, 2019 •
edited
Loading

Coverage Status

Coverage remained the same at 100.0% when pulling d66abda on theodelrieu:fix/1511 into b21c04c on nlohmann:develop.

@theodelrieu
make sure values are overwritten in from_json overloads
2806b20 
Caused unexpected behaviors when using get_to with values previously
set.

Fixes !1511
@theodelrieu
add built-in array support in get_to
e6e6805
@theodelrieu theodelrieu force-pushed the fix/1511 branch 2 times, most recently from 2edac99 to 28f5c4a Compare April 2, 2019 12:23
nlohmann
nlohmann approved these changes Apr 3, 2019
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 merged commit ee8732c into nlohmann:develop Apr 3, 2019
@nlohmann nlohmann self-assigned this Apr 3, 2019
@nlohmann nlohmann added this to the Release 3.6.2 milestone Apr 3, 2019
@nlohmann nlohmann mentioned this pull request Apr 3, 2019
Closed
@nlohmann
Copy link
Owner

nlohmann commented Apr 3, 2019

🔖 Release item

This issue/PR will be part of the next release of the library. This template helps preparing the release notes.

Type

  • ✨ New Feature
  • 🐛 Bug Fix
  • ⚡️ Improvement
  • 🔨 Further Change
  • 🔥 Deprecated function

Description

@theodelrieu theodelrieu deleted the fix/1511 branch April 3, 2019 15:48
@nlohmann nlohmann modified the milestones: Release 3.6.2, Release 3.7.0 Jul 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gregmarr gregmarr gregmarr left review comments

@nlohmann nlohmann nlohmann approved these changes

Assignees

@nlohmann nlohmann

Labels
release item: 🐛 bug fix
Projects
None yet
Milestone
Release 3.7.0
Development

Successfully merging this pull request may close these issues.

Conversion to user type containing a std::vector not working with documented approach
4 participants
@theodelrieu @coveralls @nlohmann @gregmarr