amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-05-23 14:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/filenotfound

Browse Source
This commit is contained in:
Niels Lohmann
2016-11-25 17:39:24 +01:00
parent 4bb41d065b f194db9aa6
commit 1ed510c232
7 changed files with 120 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/json.hpp
+5 -1
View File
@@ -8742,6 +8742,7 @@ basic_json_parser_66:
m_line_buffer.clear();
for (m_cursor = m_start; m_cursor != m_limit; ++m_cursor)
{
assert(m_cursor != nullptr);
m_line_buffer.append(1, static_cast<const char>(*m_cursor));
}
}
@@ -8749,7 +8750,10 @@ basic_json_parser_66:
// append n characters to make sure that there is sufficient
// space between m_cursor and m_limit
m_line_buffer.append(1, '\x00');
m_line_buffer.append(n - 1, '\x01');
if (n > 0)
{
m_line_buffer.append(n - 1, '\x01');
}
}
else
{
src/json.hpp.re2c
+5 -1
View File
@@ -7891,6 +7891,7 @@ class basic_json
m_line_buffer.clear();
for (m_cursor = m_start; m_cursor != m_limit; ++m_cursor)
{
assert(m_cursor != nullptr);
m_line_buffer.append(1, static_cast<const char>(*m_cursor));
}
}
@@ -7898,7 +7899,10 @@ class basic_json
// append n characters to make sure that there is sufficient
// space between m_cursor and m_limit
m_line_buffer.append(1, '\x00');
m_line_buffer.append(n - 1, '\x01');
if (n > 0)
{
m_line_buffer.append(n - 1, '\x01');
}
}
else
{