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

Add pair support, fix CompatibleObject conversions (fixes #600) #609

Merged
merged 2 commits into from
Jun 7, 2017

Conversation

theodelrieu
Copy link
Contributor

I've put the tests in some weird places, @nlohmann do you have any better spot to put them?

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) to 99.688% when pulling 550045d on theodelrieu:develop into 1a9d766 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
Copy link
Owner

nlohmann commented Jun 6, 2017

About the test cases - I also have no better idea.

@nlohmann nlohmann self-assigned this Jun 6, 2017
@nlohmann nlohmann added this to the Release 3.0.0 milestone Jun 6, 2017
@nlohmann
Copy link
Owner

nlohmann commented Jun 6, 2017

Could you please add a test to cover line 1119 (see https://coveralls.io/builds/11848200/source?filename=src%2Fjson.hpp#L1119)?

Instead of calling CompatibleObjectType iterator-range constructor,
first convert json::value_type to CompatibleObjectType::value_type
@coveralls
Copy link

Coverage Status

Coverage increased (+0.002%) to 99.722% when pulling cea39df on theodelrieu:develop into 92ef196 on nlohmann:develop.

@nlohmann
Copy link
Owner

nlohmann commented Jun 7, 2017

Thanks! I shall close the PR once Travis finishes.

@nlohmann nlohmann merged commit 52f934c into nlohmann:develop Jun 7, 2017
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