1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-29 23:01:16 +03:00

added changes from #105: MSVC fixes

- additionally, switch off optimization flags to maybe allow build to
complete on AppVeyor
This commit is contained in:
Niels
2015-07-16 18:45:19 +02:00
parent e007f02c54
commit 5084159048
4 changed files with 64 additions and 47 deletions

View File

@ -6939,7 +6939,7 @@ TEST_CASE("lexicographical comparison operators")
CAPTURE(i);
CAPTURE(j);
// check precomputed values
CHECK( (j_types[i] < j_types[j]) == expected[i][j] );
CHECK(operator<(j_types[i], j_types[j]) == expected[i][j]);
}
}
}
@ -8163,9 +8163,11 @@ TEST_CASE("parser class")
SECTION("escaped")
{
// quotation mark "\""
CHECK(json::parser("\"\\\"\"").parse() == R"("\"")"_json);
auto r1 = R"("\"")"_json;
CHECK(json::parser("\"\\\"\"").parse() == r1);
// reverse solidus "\\"
CHECK(json::parser("\"\\\\\"").parse() == R"("\\")"_json);
auto r2 = R"("\\")"_json;
CHECK(json::parser("\"\\\\\"").parse() == r2);
// solidus
CHECK(json::parser("\"\\/\"").parse() == R"("/")"_json);
// backspace
@ -9738,7 +9740,8 @@ TEST_CASE("regression tests")
{
auto s = "[\"\\\"foo\\\"\"]";
json j = json::parse(s);
CHECK(j == R"(["\"foo\""])"_json);
auto expected = R"(["\"foo\""])"_json;
CHECK(j == expected);
}
}