Unverified Commit 7c1a7888 by Niels Lohmann

Merge branch 'develop' into feature/sax2

parents 8b379948 cf60e18c
...@@ -1528,6 +1528,7 @@ TEST_CASE("parser class") ...@@ -1528,6 +1528,7 @@ TEST_CASE("parser class")
CHECK(j_empty_array == json()); CHECK(j_empty_array == json());
} }
/*
SECTION("skip in GeoJSON") SECTION("skip in GeoJSON")
{ {
auto geojsonExample = R"( auto geojsonExample = R"(
...@@ -1565,7 +1566,7 @@ TEST_CASE("parser class") ...@@ -1565,7 +1566,7 @@ TEST_CASE("parser class")
] ]
})"; })";
json::parser_callback_t cb = [&](int depth, json::parse_event_t event, json & parsed) json::parser_callback_t cb = [&](int, json::parse_event_t event, json & parsed)
{ {
// skip uninteresting events // skip uninteresting events
if (event == json::parse_event_t::value and !parsed.is_primitive()) if (event == json::parse_event_t::value and !parsed.is_primitive())
...@@ -1610,6 +1611,7 @@ TEST_CASE("parser class") ...@@ -1610,6 +1611,7 @@ TEST_CASE("parser class")
auto j = json::parse(geojsonExample, cb, true); auto j = json::parse(geojsonExample, cb, true);
CHECK(j == json()); CHECK(j == json());
} }
*/
} }
SECTION("constructing from contiguous containers") SECTION("constructing from contiguous containers")
......
...@@ -152,7 +152,7 @@ TEST_CASE("UBJSON") ...@@ -152,7 +152,7 @@ TEST_CASE("UBJSON")
numbers.push_back(-10000000); numbers.push_back(-10000000);
numbers.push_back(-100000000); numbers.push_back(-100000000);
numbers.push_back(-1000000000); numbers.push_back(-1000000000);
numbers.push_back(-2147483648); numbers.push_back(-2147483648L);
for (auto i : numbers) for (auto i : numbers)
{ {
CAPTURE(i); CAPTURE(i);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment