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

Feature/unordered map conversion #1138

Merged

Conversation

theodelrieu
Copy link
Contributor

Add conversion for std::unordered_map, when KeyType != basic_json<>::string_t

Fixes #1133


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 Jun 18, 2018

Coverage Status

Coverage remained the same at 100.0% when pulling 2c920a1 on theodelrieu:feature/unordered_map_conversion into e830bc5 on nlohmann:develop.

@theodelrieu theodelrieu force-pushed the feature/unordered_map_conversion branch from 1a9d681 to f8a265d Compare June 18, 2018 10:42
@gregmarr
Copy link
Contributor

Weird that the single header contains things that aren't part of your PR. I guess someone committed to develop without running make amalgamate recently.

@gregmarr
Copy link
Contributor

LGTM

@theodelrieu theodelrieu force-pushed the feature/unordered_map_conversion branch from f8a265d to 42247f8 Compare June 18, 2018 12:42
@theodelrieu theodelrieu force-pushed the feature/unordered_map_conversion branch from 42247f8 to 2c920a1 Compare June 18, 2018 13:14
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 added this to the Release 3.1.3 milestone Jun 18, 2018
@nlohmann nlohmann self-assigned this Jun 18, 2018
@nlohmann nlohmann merged commit d505ed7 into nlohmann:develop Jun 18, 2018
@nlohmann
Copy link
Owner

Thanks @theodelrieu for the PR and @gregmarr for the review!

@theodelrieu theodelrieu deleted the feature/unordered_map_conversion branch June 18, 2018 20:27
@014972304505347
Copy link

014972304505347 commented Jun 18, 2018

When can we expect the dev branch to merge with master branch? I use vcpkg to install this library -- is there a way to get dev branch using vcpkg?

@nlohmann
Copy link
Owner

I hope to release version 3.1.3 before end of July.

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

Successfully merging this pull request may close these issues.

5 participants