Merge branch 'develop' into issues/1457

This commit is contained in:
Niels Lohmann authored and GitHub committed 2020-05-13 12:48:46 +02:00
commit a4266bbb7d
1178 files changed
+6590 -6298894

No files matched your search

+2 -2
View File
@@ -344,13 +344,13 @@ class lexer : public lexer_base<BasicJsonType>
}
else
{
error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
return token_type::parse_error;
}
}
else
{
error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
return token_type::parse_error;
}
}