Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
畅游知识海洋
json
提交
9a51fb4d
J
json
项目概览
畅游知识海洋
/
json
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
json
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
GitCode(gitcode.net)2024年7月9日维护升级公告
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
9a51fb4d
编写于
12月 16, 2017
作者:
N
Niels Lohmann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
🚨
fixed some warnings
上级
7bf007f2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
62 addition
and
62 deletion
+62
-62
Makefile
Makefile
+1
-1
src/json.hpp
src/json.hpp
+1
-1
test/src/unit-conversions.cpp
test/src/unit-conversions.cpp
+60
-60
未找到文件。
Makefile
浏览文件 @
9a51fb4d
...
...
@@ -95,7 +95,7 @@ pedantic_clang:
# calling GCC with most warnings
pedantic_gcc
:
$(MAKE)
json_unit
CXX
=
g++
CXX
FLAGS
=
"
\
$(MAKE)
json_unit
CXXFLAGS
=
"
\
-std=c++11
\
-Wno-deprecated-declarations
\
-Werror
\
...
...
src/json.hpp
浏览文件 @
9a51fb4d
...
...
@@ -6775,7 +6775,7 @@ class serializer
};
const
uint8_t
type
=
utf8d
[
byte
];
state
=
utf8d
[
256
+
state
*
16
+
type
];
state
=
utf8d
[
256
u
+
state
*
16u
+
type
];
}
/*!
...
...
test/src/unit-conversions.cpp
浏览文件 @
9a51fb4d
...
...
@@ -939,40 +939,40 @@ TEST_CASE("value conversion")
SECTION
(
"std::map"
)
{
auto
m1
=
j1
.
get
<
std
::
map
<
std
::
string
,
int
>>
();
auto
m2
=
j2
.
get
<
std
::
map
<
std
::
string
,
unsigned
int
>>
();
auto
m3
=
j3
.
get
<
std
::
map
<
std
::
string
,
double
>>
();
auto
m4
=
j4
.
get
<
std
::
map
<
std
::
string
,
bool
>>
();
//auto m5 =
j5.get<std::map<std::string, std::string>>();
j1
.
get
<
std
::
map
<
std
::
string
,
int
>>
();
j2
.
get
<
std
::
map
<
std
::
string
,
unsigned
int
>>
();
j3
.
get
<
std
::
map
<
std
::
string
,
double
>>
();
j4
.
get
<
std
::
map
<
std
::
string
,
bool
>>
();
j5
.
get
<
std
::
map
<
std
::
string
,
std
::
string
>>
();
}
SECTION
(
"std::unordered_map"
)
{
auto
m1
=
j1
.
get
<
std
::
unordered_map
<
std
::
string
,
int
>>
();
auto
m2
=
j2
.
get
<
std
::
unordered_map
<
std
::
string
,
unsigned
int
>>
();
auto
m3
=
j3
.
get
<
std
::
unordered_map
<
std
::
string
,
double
>>
();
auto
m4
=
j4
.
get
<
std
::
unordered_map
<
std
::
string
,
bool
>>
();
//auto m5 =
j5.get<std::unordered_map<std::string, std::string>>();
j1
.
get
<
std
::
unordered_map
<
std
::
string
,
int
>>
();
j2
.
get
<
std
::
unordered_map
<
std
::
string
,
unsigned
int
>>
();
j3
.
get
<
std
::
unordered_map
<
std
::
string
,
double
>>
();
j4
.
get
<
std
::
unordered_map
<
std
::
string
,
bool
>>
();
j5
.
get
<
std
::
unordered_map
<
std
::
string
,
std
::
string
>>
();
//CHECK(m5["one"] == "eins");
}
SECTION
(
"std::multimap"
)
{
auto
m1
=
j1
.
get
<
std
::
multimap
<
std
::
string
,
int
>>
();
auto
m2
=
j2
.
get
<
std
::
multimap
<
std
::
string
,
unsigned
int
>>
();
auto
m3
=
j3
.
get
<
std
::
multimap
<
std
::
string
,
double
>>
();
auto
m4
=
j4
.
get
<
std
::
multimap
<
std
::
string
,
bool
>>
();
//auto m5 =
j5.get<std::multimap<std::string, std::string>>();
j1
.
get
<
std
::
multimap
<
std
::
string
,
int
>>
();
j2
.
get
<
std
::
multimap
<
std
::
string
,
unsigned
int
>>
();
j3
.
get
<
std
::
multimap
<
std
::
string
,
double
>>
();
j4
.
get
<
std
::
multimap
<
std
::
string
,
bool
>>
();
j5
.
get
<
std
::
multimap
<
std
::
string
,
std
::
string
>>
();
//CHECK(m5["one"] == "eins");
}
SECTION
(
"std::unordered_multimap"
)
{
auto
m1
=
j1
.
get
<
std
::
unordered_multimap
<
std
::
string
,
int
>>
();
auto
m2
=
j2
.
get
<
std
::
unordered_multimap
<
std
::
string
,
unsigned
int
>>
();
auto
m3
=
j3
.
get
<
std
::
unordered_multimap
<
std
::
string
,
double
>>
();
auto
m4
=
j4
.
get
<
std
::
unordered_multimap
<
std
::
string
,
bool
>>
();
//auto m5 =
j5.get<std::unordered_multimap<std::string, std::string>>();
j1
.
get
<
std
::
unordered_multimap
<
std
::
string
,
int
>>
();
j2
.
get
<
std
::
unordered_multimap
<
std
::
string
,
unsigned
int
>>
();
j3
.
get
<
std
::
unordered_multimap
<
std
::
string
,
double
>>
();
j4
.
get
<
std
::
unordered_multimap
<
std
::
string
,
bool
>>
();
j5
.
get
<
std
::
unordered_multimap
<
std
::
string
,
std
::
string
>>
();
//CHECK(m5["one"] == "eins");
}
...
...
@@ -993,29 +993,29 @@ TEST_CASE("value conversion")
SECTION
(
"std::list"
)
{
auto
m1
=
j1
.
get
<
std
::
list
<
int
>>
();
auto
m2
=
j2
.
get
<
std
::
list
<
unsigned
int
>>
();
auto
m3
=
j3
.
get
<
std
::
list
<
double
>>
();
auto
m4
=
j4
.
get
<
std
::
list
<
bool
>>
();
auto
m5
=
j5
.
get
<
std
::
list
<
std
::
string
>>
();
j1
.
get
<
std
::
list
<
int
>>
();
j2
.
get
<
std
::
list
<
unsigned
int
>>
();
j3
.
get
<
std
::
list
<
double
>>
();
j4
.
get
<
std
::
list
<
bool
>>
();
j5
.
get
<
std
::
list
<
std
::
string
>>
();
}
SECTION
(
"std::forward_list"
)
{
auto
m1
=
j1
.
get
<
std
::
forward_list
<
int
>>
();
auto
m2
=
j2
.
get
<
std
::
forward_list
<
unsigned
int
>>
();
auto
m3
=
j3
.
get
<
std
::
forward_list
<
double
>>
();
auto
m4
=
j4
.
get
<
std
::
forward_list
<
bool
>>
();
auto
m5
=
j5
.
get
<
std
::
forward_list
<
std
::
string
>>
();
j1
.
get
<
std
::
forward_list
<
int
>>
();
j2
.
get
<
std
::
forward_list
<
unsigned
int
>>
();
j3
.
get
<
std
::
forward_list
<
double
>>
();
j4
.
get
<
std
::
forward_list
<
bool
>>
();
j5
.
get
<
std
::
forward_list
<
std
::
string
>>
();
}
SECTION
(
"std::array"
)
{
auto
m1
=
j1
.
get
<
std
::
array
<
int
,
4
>>
();
auto
m2
=
j2
.
get
<
std
::
array
<
unsigned
int
,
3
>>
();
auto
m3
=
j3
.
get
<
std
::
array
<
double
,
4
>>
();
auto
m4
=
j4
.
get
<
std
::
array
<
bool
,
3
>>
();
auto
m5
=
j5
.
get
<
std
::
array
<
std
::
string
,
3
>>
();
j1
.
get
<
std
::
array
<
int
,
4
>>
();
j2
.
get
<
std
::
array
<
unsigned
int
,
3
>>
();
j3
.
get
<
std
::
array
<
double
,
4
>>
();
j4
.
get
<
std
::
array
<
bool
,
3
>>
();
j5
.
get
<
std
::
array
<
std
::
string
,
3
>>
();
SECTION
(
"std::array is larger than JSON"
)
{
...
...
@@ -1035,47 +1035,47 @@ TEST_CASE("value conversion")
SECTION
(
"std::valarray"
)
{
auto
m1
=
j1
.
get
<
std
::
valarray
<
int
>>
();
auto
m2
=
j2
.
get
<
std
::
valarray
<
unsigned
int
>>
();
auto
m3
=
j3
.
get
<
std
::
valarray
<
double
>>
();
auto
m4
=
j4
.
get
<
std
::
valarray
<
bool
>>
();
auto
m5
=
j5
.
get
<
std
::
valarray
<
std
::
string
>>
();
j1
.
get
<
std
::
valarray
<
int
>>
();
j2
.
get
<
std
::
valarray
<
unsigned
int
>>
();
j3
.
get
<
std
::
valarray
<
double
>>
();
j4
.
get
<
std
::
valarray
<
bool
>>
();
j5
.
get
<
std
::
valarray
<
std
::
string
>>
();
}
SECTION
(
"std::vector"
)
{
auto
m1
=
j1
.
get
<
std
::
vector
<
int
>>
();
auto
m2
=
j2
.
get
<
std
::
vector
<
unsigned
int
>>
();
auto
m3
=
j3
.
get
<
std
::
vector
<
double
>>
();
auto
m4
=
j4
.
get
<
std
::
vector
<
bool
>>
();
auto
m5
=
j5
.
get
<
std
::
vector
<
std
::
string
>>
();
j1
.
get
<
std
::
vector
<
int
>>
();
j2
.
get
<
std
::
vector
<
unsigned
int
>>
();
j3
.
get
<
std
::
vector
<
double
>>
();
j4
.
get
<
std
::
vector
<
bool
>>
();
j5
.
get
<
std
::
vector
<
std
::
string
>>
();
}
SECTION
(
"std::deque"
)
{
auto
m1
=
j1
.
get
<
std
::
deque
<
int
>>
();
auto
m2
=
j2
.
get
<
std
::
deque
<
unsigned
int
>>
();
auto
m3
=
j2
.
get
<
std
::
deque
<
double
>>
();
auto
m4
=
j4
.
get
<
std
::
deque
<
bool
>>
();
auto
m5
=
j5
.
get
<
std
::
deque
<
std
::
string
>>
();
j1
.
get
<
std
::
deque
<
int
>>
();
j2
.
get
<
std
::
deque
<
unsigned
int
>>
();
j2
.
get
<
std
::
deque
<
double
>>
();
j4
.
get
<
std
::
deque
<
bool
>>
();
j5
.
get
<
std
::
deque
<
std
::
string
>>
();
}
SECTION
(
"std::set"
)
{
auto
m1
=
j1
.
get
<
std
::
set
<
int
>>
();
auto
m2
=
j2
.
get
<
std
::
set
<
unsigned
int
>>
();
auto
m3
=
j3
.
get
<
std
::
set
<
double
>>
();
auto
m4
=
j4
.
get
<
std
::
set
<
bool
>>
();
auto
m5
=
j5
.
get
<
std
::
set
<
std
::
string
>>
();
j1
.
get
<
std
::
set
<
int
>>
();
j2
.
get
<
std
::
set
<
unsigned
int
>>
();
j3
.
get
<
std
::
set
<
double
>>
();
j4
.
get
<
std
::
set
<
bool
>>
();
j5
.
get
<
std
::
set
<
std
::
string
>>
();
}
SECTION
(
"std::unordered_set"
)
{
auto
m1
=
j1
.
get
<
std
::
unordered_set
<
int
>>
();
auto
m2
=
j2
.
get
<
std
::
unordered_set
<
unsigned
int
>>
();
auto
m3
=
j3
.
get
<
std
::
unordered_set
<
double
>>
();
auto
m4
=
j4
.
get
<
std
::
unordered_set
<
bool
>>
();
auto
m5
=
j5
.
get
<
std
::
unordered_set
<
std
::
string
>>
();
j1
.
get
<
std
::
unordered_set
<
int
>>
();
j2
.
get
<
std
::
unordered_set
<
unsigned
int
>>
();
j3
.
get
<
std
::
unordered_set
<
double
>>
();
j4
.
get
<
std
::
unordered_set
<
bool
>>
();
j5
.
get
<
std
::
unordered_set
<
std
::
string
>>
();
}
SECTION
(
"exception in case of a non-object type"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录