External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation on windows.

Browse Source 
Raw strings, escape sequences and custom literal together are buggy on MSVS.
This commit is contained in:
Alexander Nevskiy 2015-06-13 01:50:32 +03:00
parent 0035baf088
commit b0c5ce660f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/unit.cpp
View File

@ -3699,10 +3699,12 @@ TEST_CASE("iterators")
SECTION("uninitialized") SECTION("uninitialized")
{ {
json::iterator it; json::iterator it;
CHECK(it.m_object == nullptr); auto r1 = it.m_object == nullptr;
CHECK(r1); // MSVC fails to compile std::cout << nullptr;
json::const_iterator cit; json::const_iterator cit;
CHECK(cit.m_object == nullptr); auto r2 = it.m_object == nullptr;
CHECK(r2);
} }
SECTION("boolean") SECTION("boolean")
@ -7414,7 +7416,8 @@ TEST_CASE("parser class")
SECTION("escaped") SECTION("escaped")
{ {
// quotation mark "\"" // quotation mark "\""
CHECK(json::parser("\"\\\"\"").parse() == R"("\"")"_json); auto s = R"("\"")";
CHECK(json::parser("\"\\\"\"").parse() == json::parser(s).parse());
// reverse solidus "\\" // reverse solidus "\\"
CHECK(json::parser("\"\\\\\"").parse() == R"("\\")"_json); CHECK(json::parser("\"\\\\\"").parse() == R"("\\")"_json);
// solidus // solidus
@ -8807,8 +8810,12 @@ TEST_CASE("regression tests")
SECTION("escape_dobulequote") SECTION("escape_dobulequote")
{ {
auto s = "[\"\\\"foo\\\"\"]"; auto s = "[\"\\\"foo\\\"\"]";
auto raw_s = R"(["\"foo\""])";
json j = json::parse(s); json j = json::parse(s);
CHECK(j == R"(["\"foo\""])"_json); json raw_j = json::parse(raw_s);
CHECK(j == raw_j);
} }
} }