diff --git a/README.md b/README.md index 5d84c3f27550e95a29a3d64cc710a7dc81ba9027..af4f8cbad9c0573ca3d96a0a230472a4ce294b53 100644 --- a/README.md +++ b/README.md @@ -840,6 +840,7 @@ I deeply appreciate the help of the following people. - [tinloaf](https://github.com/tinloaf) made sure all pushed warnings are properly popped. - [Fytch](https://github.com/Fytch) found a bug in the documentation. - [Jay Sistar](https://github.com/Type1J) implemented a Meson build description +- [Henry Lee](https://github.com/HenryRLee) fixed a warning in ICC Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone. diff --git a/test/src/unit-iterators1.cpp b/test/src/unit-iterators1.cpp index 2dc9aae840691fed5c89f0220bd2c036aac451b8..783bf850a268df6d8c3f58171ab0392bbf571cd2 100644 --- a/test/src/unit-iterators1.cpp +++ b/test/src/unit-iterators1.cpp @@ -1513,70 +1513,70 @@ TEST_CASE("iterators 1") } SECTION("conversion from iterator to const iterator") - { + { SECTION("boolean") - { + { json j = true; - json::const_iterator it = j.begin(); - CHECK(it == j.cbegin()); - it = j.begin(); - CHECK(it == j.cbegin()); - } + json::const_iterator it = j.begin(); + CHECK(it == j.cbegin()); + it = j.begin(); + CHECK(it == j.cbegin()); + } SECTION("string") - { + { json j = "hello world"; - json::const_iterator it = j.begin(); - CHECK(it == j.cbegin()); - it = j.begin(); - CHECK(it == j.cbegin()); - } + json::const_iterator it = j.begin(); + CHECK(it == j.cbegin()); + it = j.begin(); + CHECK(it == j.cbegin()); + } SECTION("array") - { + { json j = {1, 2, 3}; - json::const_iterator it = j.begin(); - CHECK(it == j.cbegin()); - it = j.begin(); - CHECK(it == j.cbegin()); - } + json::const_iterator it = j.begin(); + CHECK(it == j.cbegin()); + it = j.begin(); + CHECK(it == j.cbegin()); + } SECTION("object") - { + { json j = {{"A", 1}, {"B", 2}, {"C", 3}}; - json::const_iterator it = j.begin(); - CHECK(it == j.cbegin()); - it = j.begin(); - CHECK(it == j.cbegin()); - } + json::const_iterator it = j.begin(); + CHECK(it == j.cbegin()); + it = j.begin(); + CHECK(it == j.cbegin()); + } SECTION("number (integer)") - { + { json j = 23; - json::const_iterator it = j.begin(); - CHECK(it == j.cbegin()); - it = j.begin(); - CHECK(it == j.cbegin()); - } + json::const_iterator it = j.begin(); + CHECK(it == j.cbegin()); + it = j.begin(); + CHECK(it == j.cbegin()); + } SECTION("number (unsigned)") - { + { json j = 23u; - json::const_iterator it = j.begin(); - CHECK(it == j.cbegin()); - it = j.begin(); - CHECK(it == j.cbegin()); - } + json::const_iterator it = j.begin(); + CHECK(it == j.cbegin()); + it = j.begin(); + CHECK(it == j.cbegin()); + } SECTION("number (float)") - { + { json j = 23.42; - json::const_iterator it = j.begin(); - CHECK(it == j.cbegin()); - it = j.begin(); - CHECK(it == j.cbegin()); - } + json::const_iterator it = j.begin(); + CHECK(it == j.cbegin()); + it = j.begin(); + CHECK(it == j.cbegin()); + } SECTION("null") - { + { json j = nullptr; - json::const_iterator it = j.begin(); - CHECK(it == j.cbegin()); - it = j.begin(); - CHECK(it == j.cbegin()); - } - } + json::const_iterator it = j.begin(); + CHECK(it == j.cbegin()); + it = j.begin(); + CHECK(it == j.cbegin()); + } + } }