j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Clean-up ordered_map declarations

Browse source
This commit is contained in:
gatopeich 2020-06-21 22:28:03 +01:00
parent 6ee9e5f402
commit 27aaf6f845
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -25,7 +25,9 @@ benchmarks/files/numbers/*.json
cmake-build-debug cmake-build-debug
test/test-* test/test-*
test/test_data.hpp
/.vs /.vs
.vscode
doc/mkdocs/venv/ doc/mkdocs/venv/
doc/mkdocs/docs/images doc/mkdocs/docs/images

7
include/nlohmann/ordered_map.hpp
View file

@ -17,11 +17,12 @@ struct ordered_map : Container
{ {
using key_type = Key; using key_type = Key;
using mapped_type = T; using mapped_type = T;
using value_type = typename Container::value_type; using typename Container::iterator;
using size_type = typename Container::size_type; using typename Container::value_type;
using typename Container::size_type;
using Container::Container; using Container::Container;
std::pair<typename Container::iterator, bool> emplace(key_type&& key, T&& t) std::pair<iterator, bool> emplace(key_type&& key, T&& t)
{ {
for (auto it = this->begin(); it != this->end(); ++it) for (auto it = this->begin(); it != this->end(); ++it)
{ {

7
single_include/nlohmann/json.hpp
View file

@ -15886,11 +15886,12 @@ struct ordered_map : Container
{ {
using key_type = Key; using key_type = Key;
using mapped_type = T; using mapped_type = T;
using value_type = typename Container::value_type; using typename Container::iterator;
using size_type = typename Container::size_type; using typename Container::value_type;
using typename Container::size_type;
using Container::Container; using Container::Container;
std::pair<typename Container::iterator, bool> emplace(key_type&& key, T&& t) std::pair<iterator, bool> emplace(key_type&& key, T&& t)
{ {
for (auto it = this->begin(); it != this->end(); ++it) for (auto it = this->begin(); it != this->end(); ++it)
{ {