Skip to content

J
json

畅游知识海洋 / json
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
J
json

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 5b53f03e 编写于 作者: N Niels Lohmann
浏览文件
操作

Merge branch 'develop' into TurpentineDistillery-feature/locale_independent_num_to_str

上级 d1479e47 9a9d0ba3
隐藏空白更改
内联 并排
Showing with 14 addition and 14 deletion
src/json.hpp
浏览文件 @ 5b53f03e
...@@ -6545,10 +6545,10 @@ class basic_json ...@@ -6545,10 +6545,10 @@ class basic_json
{ {
case 8: case 8:
{ {
vec.push_back(static_cast<uint8_t>((number >> 070) & 0xff)); vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 070) & 0xff));
vec.push_back(static_cast<uint8_t>((number >> 060) & 0xff)); vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 060) & 0xff));
vec.push_back(static_cast<uint8_t>((number >> 050) & 0xff)); vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 050) & 0xff));
vec.push_back(static_cast<uint8_t>((number >> 040) & 0xff)); vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 040) & 0xff));
// intentional fall-through // intentional fall-through
} }
...@@ -7021,7 +7021,7 @@ class basic_json ...@@ -7021,7 +7021,7 @@ class basic_json
const auto N = j.m_value.string->size(); const auto N = j.m_value.string->size();
if (N <= 0x17) if (N <= 0x17)
{ {
v.push_back(0x60 + N); // 1 byte for string + size v.push_back(0x60 + static_cast<uint8_t>(N)); // 1 byte for string + size
} }
else if (N <= 0xff) else if (N <= 0xff)
{ {
...@@ -7057,7 +7057,7 @@ class basic_json ...@@ -7057,7 +7057,7 @@ class basic_json
const auto N = j.m_value.array->size(); const auto N = j.m_value.array->size();
if (N <= 0x17) if (N <= 0x17)
{ {
v.push_back(0x80 + N); // 1 byte for array + size v.push_back(0x80 + static_cast<uint8_t>(N)); // 1 byte for array + size
} }
else if (N <= 0xff) else if (N <= 0xff)
{ {
...@@ -7095,7 +7095,7 @@ class basic_json ...@@ -7095,7 +7095,7 @@ class basic_json
const auto N = j.m_value.object->size(); const auto N = j.m_value.object->size();
if (N <= 0x17) if (N <= 0x17)
{ {
v.push_back(0xa0 + N); // 1 byte for object + size v.push_back(0xa0 + static_cast<uint8_t>(N)); // 1 byte for object + size
} }
else if (N <= 0xff) else if (N <= 0xff)
{ {
......
src/json.hpp.re2c
浏览文件 @ 5b53f03e
...@@ -6545,10 +6545,10 @@ class basic_json ...@@ -6545,10 +6545,10 @@ class basic_json
{ {
case 8: case 8:
{ {
vec.push_back(static_cast<uint8_t>((number >> 070) & 0xff)); vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 070) & 0xff));
vec.push_back(static_cast<uint8_t>((number >> 060) & 0xff)); vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 060) & 0xff));
vec.push_back(static_cast<uint8_t>((number >> 050) & 0xff)); vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 050) & 0xff));
vec.push_back(static_cast<uint8_t>((number >> 040) & 0xff)); vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 040) & 0xff));
// intentional fall-through // intentional fall-through
} }
...@@ -7021,7 +7021,7 @@ class basic_json ...@@ -7021,7 +7021,7 @@ class basic_json
const auto N = j.m_value.string->size(); const auto N = j.m_value.string->size();
if (N <= 0x17) if (N <= 0x17)
{ {
v.push_back(0x60 + N); // 1 byte for string + size v.push_back(0x60 + static_cast<uint8_t>(N)); // 1 byte for string + size
} }
else if (N <= 0xff) else if (N <= 0xff)
{ {
...@@ -7057,7 +7057,7 @@ class basic_json ...@@ -7057,7 +7057,7 @@ class basic_json
const auto N = j.m_value.array->size(); const auto N = j.m_value.array->size();
if (N <= 0x17) if (N <= 0x17)
{ {
v.push_back(0x80 + N); // 1 byte for array + size v.push_back(0x80 + static_cast<uint8_t>(N)); // 1 byte for array + size
} }
else if (N <= 0xff) else if (N <= 0xff)
{ {
...@@ -7095,7 +7095,7 @@ class basic_json ...@@ -7095,7 +7095,7 @@ class basic_json
const auto N = j.m_value.object->size(); const auto N = j.m_value.object->size();
if (N <= 0x17) if (N <= 0x17)
{ {
v.push_back(0xa0 + N); // 1 byte for object + size v.push_back(0xa0 + static_cast<uint8_t>(N)); // 1 byte for object + size
} }
else if (N <= 0xff) else if (N <= 0xff)
{ {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或