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 ordered_map ctor with initializer_list (fixes #3343) #3370

Merged
merged 1 commit into from
Mar 7, 2022
Merged

Fix ordered_map ctor with initializer_list (fixes #3343) #3370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/nlohmann/ordered_map.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
template <class It>
ordered_map(It first, It last, const Allocator& alloc = Allocator())
: Container{first, last, alloc} {}
ordered_map(std::initializer_list<T> init, const Allocator& alloc = Allocator() )
ordered_map(std::initializer_list<value_type> init, const Allocator& alloc = Allocator() )
: Container{init, alloc} {}

std::pair<iterator, bool> emplace(const key_type& key, T&& t)
Expand Down
2 changes: 1 addition & 1 deletion single_include/nlohmann/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17070,7 +17070,7 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
template <class It>
ordered_map(It first, It last, const Allocator& alloc = Allocator())
: Container{first, last, alloc} {}
ordered_map(std::initializer_list<T> init, const Allocator& alloc = Allocator() )
ordered_map(std::initializer_list<value_type> init, const Allocator& alloc = Allocator() )
: Container{init, alloc} {}

std::pair<iterator, bool> emplace(const key_type& key, T&& t)
Expand Down
12 changes: 12 additions & 0 deletions test/src/unit-regression2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,18 @@ TEST_CASE("regression tests 2")

CHECK(j.dump() == "[1,4]");
}

SECTION("issue #3343 - json and ordered_json are not interchangable")
{
json::object_t jobj({ { "product", "one" } });
ordered_json::object_t ojobj({{"product", "one"}});

auto jit = jobj.begin();
auto ojit = ojobj.begin();

CHECK(jit->first == ojit->first);
CHECK(jit->second.get<std::string>() == ojit->second.get<std::string>());
}
}

DOCTEST_CLANG_SUPPRESS_WARNING_POP