fixed build

This commit is contained in:
Niels 2015-08-02 21:35:07 +02:00
parent b5a05e1121
commit e64dc532ab
3 changed files with 4 additions and 4 deletions

View file

@ -5752,7 +5752,7 @@ class basic_json
} }
/// increment operator (needed for range-based for) /// increment operator (needed for range-based for)
iterator_wrapper_internal operator++() iterator_wrapper_internal& operator++()
{ {
++anchor; ++anchor;
++array_index; ++array_index;

View file

@ -5752,7 +5752,7 @@ class basic_json
} }
/// increment operator (needed for range-based for) /// increment operator (needed for range-based for)
iterator_wrapper_internal operator++() iterator_wrapper_internal& operator++()
{ {
++anchor; ++anchor;
++array_index; ++array_index;

View file

@ -7554,8 +7554,8 @@ TEST_CASE("iterator_wrapper")
json j_object = {{"key1", 1}, {"key2", 2}}; json j_object = {{"key1", 1}, {"key2", 2}};
for (auto it : json::iterator_wrapper(j_object)) for (auto it : json::iterator_wrapper(j_object))
{ {
CHECK((it.first == "key1" or it.first == "key2")); CHECK((it.first == json("key1") or it.first == json("key2")));
CHECK((it.key() == "key1" or it.key() == "key2")); CHECK((it.key() == json("key1") or it.key() == json("key2")));
CHECK(it.key() == it.first); CHECK(it.key() == it.first);
CHECK((it.second == json(1) or it.second == json(2))); CHECK((it.second == json(1) or it.second == json(2)));