mirror of
https://github.com/nlohmann/json.git
synced 2025-06-12 07:32:53 +08:00
ordered_map::insert(InputIt first, InputIt last) is added
This commit is contained in:
parent
5155cc2c48
commit
972c15f26e
@ -168,6 +168,19 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
|
|||||||
Container::push_back(value);
|
Container::push_back(value);
|
||||||
return {--this->end(), true};
|
return {--this->end(), true};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<typename InputIt>
|
||||||
|
using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
|
||||||
|
std::input_iterator_tag>::value>::type;
|
||||||
|
|
||||||
|
template<typename InputIt, typename = require_input_iter<InputIt>>
|
||||||
|
void insert(InputIt first, InputIt last)
|
||||||
|
{
|
||||||
|
for (auto it = first; it != last; ++it)
|
||||||
|
{
|
||||||
|
insert(*it);
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace nlohmann
|
} // namespace nlohmann
|
||||||
|
@ -16634,6 +16634,19 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
|
|||||||
Container::push_back(value);
|
Container::push_back(value);
|
||||||
return {--this->end(), true};
|
return {--this->end(), true};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<typename InputIt>
|
||||||
|
using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
|
||||||
|
std::input_iterator_tag>::value>::type;
|
||||||
|
|
||||||
|
template<typename InputIt, typename = require_input_iter<InputIt>>
|
||||||
|
void insert(InputIt first, InputIt last)
|
||||||
|
{
|
||||||
|
for (auto it = first; it != last; ++it)
|
||||||
|
{
|
||||||
|
insert(*it);
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace nlohmann
|
} // namespace nlohmann
|
||||||
|
@ -76,7 +76,7 @@ TEST_CASE("ordered_json")
|
|||||||
CHECK(multi_ordered.dump() == "{\"z\":1,\"m\":2,\"y\":4}");
|
CHECK(multi_ordered.dump() == "{\"z\":1,\"m\":2,\"y\":4}");
|
||||||
CHECK(multi_ordered.erase("m") == 1);
|
CHECK(multi_ordered.erase("m") == 1);
|
||||||
CHECK(multi_ordered.dump() == "{\"z\":1,\"y\":4}");
|
CHECK(multi_ordered.dump() == "{\"z\":1,\"y\":4}");
|
||||||
|
|
||||||
// Ranged insert test.
|
// Ranged insert test.
|
||||||
// It seems that values shouldn't be overwritten. Only new values are added
|
// It seems that values shouldn't be overwritten. Only new values are added
|
||||||
json j1 {{"c", 1}, {"b", 2}, {"a", 3}};
|
json j1 {{"c", 1}, {"b", 2}, {"a", 3}};
|
||||||
@ -84,7 +84,7 @@ TEST_CASE("ordered_json")
|
|||||||
j1.insert( j2.cbegin(), j2.cend() );
|
j1.insert( j2.cbegin(), j2.cend() );
|
||||||
CHECK(j1.size() == 4);
|
CHECK(j1.size() == 4);
|
||||||
CHECK(j1.dump() == "{\"a\":3,\"b\":2,\"c\":1,\"d\":42}");
|
CHECK(j1.dump() == "{\"a\":3,\"b\":2,\"c\":1,\"d\":42}");
|
||||||
|
|
||||||
ordered_json oj1 {{"c", 1}, {"b", 2}, {"a", 3}};
|
ordered_json oj1 {{"c", 1}, {"b", 2}, {"a", 3}};
|
||||||
const ordered_json oj2 {{"c", 77}, {"d", 42}, {"a", 4}};
|
const ordered_json oj2 {{"c", 77}, {"d", 42}, {"a", 4}};
|
||||||
oj1.insert( oj2.cbegin(), oj2.cend() );
|
oj1.insert( oj2.cbegin(), oj2.cend() );
|
||||||
|
Loading…
Reference in New Issue
Block a user