Allowed automerge

This commit is contained in:
Raphael Isemann committed 2015-01-10 17:33:18 +01:00
commit 6105ce5484
5 files changed
+2732 -6

No files matched your search

+3 -1
View File
@@ -2039,6 +2039,9 @@ Parses a string after opening quotes (\p ") where read.
@post The character after the closing quote \p " is the current character @ref
current_. Whitespace is skipped.
@todo Unicode escapes such as \uxxxx are missing - see
https://github.com/nlohmann/json/issues/12
*/
std::string json::parser::parseString()
{
@@ -2106,7 +2109,6 @@ std::string json::parser::parseString()
{
// currentChar is a quote, so we found the end of the string
// set pos_ behind the trailing quote
pos_++;
// find next char to parse