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

Merge branch 'develop' into feature/sax2

Browse source
This commit is contained in:
Niels Lohmann 2018-03-08 07:39:37 +01:00
commit 7c1a788893
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 83 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/src/unit-class_parser.cpp
View file

@ -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")
] ]
})"; })";
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")
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")

2
test/src/unit-ubjson.cpp
View file

@ -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);