Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
3d589fd0
Unverified
Commit
3d589fd0
authored
Jul 26, 2017
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
fixed compilation error
parent
e6aa7003
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
24 deletions
+24
-24
json.hpp
src/json.hpp
+1
-1
unit-class_const_iterator.cpp
test/src/unit-class_const_iterator.cpp
+7
-7
unit-class_iterator.cpp
test/src/unit-class_iterator.cpp
+7
-7
unit-convenience.cpp
test/src/unit-convenience.cpp
+9
-9
No files found.
src/json.hpp
View file @
3d589fd0
...
@@ -3618,7 +3618,7 @@ class primitive_iterator_t
...
@@ -3618,7 +3618,7 @@ class primitive_iterator_t
return
lhs
.
m_it
-
rhs
.
m_it
;
return
lhs
.
m_it
-
rhs
.
m_it
;
}
}
friend
constexpr
std
::
ostream
&
operator
<<
(
std
::
ostream
&
os
,
primitive_iterator_t
it
)
friend
std
::
ostream
&
operator
<<
(
std
::
ostream
&
os
,
primitive_iterator_t
it
)
{
{
return
os
<<
it
.
m_it
;
return
os
<<
it
.
m_it
;
}
}
...
...
test/src/unit-class_const_iterator.cpp
View file @
3d589fd0
...
@@ -182,32 +182,32 @@ TEST_CASE("const_iterator class")
...
@@ -182,32 +182,32 @@ TEST_CASE("const_iterator class")
{
{
json
j
(
json
::
value_t
::
null
);
json
j
(
json
::
value_t
::
null
);
json
::
const_iterator
it
=
j
.
cbegin
();
json
::
const_iterator
it
=
j
.
cbegin
();
CHECK_THROWS_AS
(
it
->
type_name
(
),
json
::
invalid_iterator
&
);
CHECK_THROWS_AS
(
std
::
string
(
it
->
type_name
()
),
json
::
invalid_iterator
&
);
CHECK_THROWS_WITH
(
it
->
type_name
(
),
"[json.exception.invalid_iterator.214] cannot get value"
);
CHECK_THROWS_WITH
(
std
::
string
(
it
->
type_name
()
),
"[json.exception.invalid_iterator.214] cannot get value"
);
}
}
SECTION
(
"number"
)
SECTION
(
"number"
)
{
{
json
j
(
17
);
json
j
(
17
);
json
::
const_iterator
it
=
j
.
cbegin
();
json
::
const_iterator
it
=
j
.
cbegin
();
CHECK
(
it
->
type_name
(
)
==
"number"
);
CHECK
(
std
::
string
(
it
->
type_name
()
)
==
"number"
);
it
=
j
.
cend
();
it
=
j
.
cend
();
CHECK_THROWS_AS
(
it
->
type_name
(
),
json
::
invalid_iterator
&
);
CHECK_THROWS_AS
(
std
::
string
(
it
->
type_name
()
),
json
::
invalid_iterator
&
);
CHECK_THROWS_WITH
(
it
->
type_name
(
),
"[json.exception.invalid_iterator.214] cannot get value"
);
CHECK_THROWS_WITH
(
std
::
string
(
it
->
type_name
()
),
"[json.exception.invalid_iterator.214] cannot get value"
);
}
}
SECTION
(
"object"
)
SECTION
(
"object"
)
{
{
json
j
({{
"foo"
,
"bar"
}});
json
j
({{
"foo"
,
"bar"
}});
json
::
const_iterator
it
=
j
.
cbegin
();
json
::
const_iterator
it
=
j
.
cbegin
();
CHECK
(
it
->
type_name
(
)
==
"string"
);
CHECK
(
std
::
string
(
it
->
type_name
()
)
==
"string"
);
}
}
SECTION
(
"array"
)
SECTION
(
"array"
)
{
{
json
j
({
1
,
2
,
3
,
4
});
json
j
({
1
,
2
,
3
,
4
});
json
::
const_iterator
it
=
j
.
cbegin
();
json
::
const_iterator
it
=
j
.
cbegin
();
CHECK
(
it
->
type_name
(
)
==
"number"
);
CHECK
(
std
::
string
(
it
->
type_name
()
)
==
"number"
);
}
}
}
}
}
}
...
...
test/src/unit-class_iterator.cpp
View file @
3d589fd0
...
@@ -166,32 +166,32 @@ TEST_CASE("iterator class")
...
@@ -166,32 +166,32 @@ TEST_CASE("iterator class")
{
{
json
j
(
json
::
value_t
::
null
);
json
j
(
json
::
value_t
::
null
);
json
::
iterator
it
=
j
.
begin
();
json
::
iterator
it
=
j
.
begin
();
CHECK_THROWS_AS
(
it
->
type_name
(
),
json
::
invalid_iterator
&
);
CHECK_THROWS_AS
(
std
::
string
(
it
->
type_name
()
),
json
::
invalid_iterator
&
);
CHECK_THROWS_WITH
(
it
->
type_name
(
),
"[json.exception.invalid_iterator.214] cannot get value"
);
CHECK_THROWS_WITH
(
std
::
string
(
it
->
type_name
()
),
"[json.exception.invalid_iterator.214] cannot get value"
);
}
}
SECTION
(
"number"
)
SECTION
(
"number"
)
{
{
json
j
(
17
);
json
j
(
17
);
json
::
iterator
it
=
j
.
begin
();
json
::
iterator
it
=
j
.
begin
();
CHECK
(
it
->
type_name
(
)
==
"number"
);
CHECK
(
std
::
string
(
it
->
type_name
()
)
==
"number"
);
it
=
j
.
end
();
it
=
j
.
end
();
CHECK_THROWS_AS
(
it
->
type_name
(
),
json
::
invalid_iterator
&
);
CHECK_THROWS_AS
(
std
::
string
(
it
->
type_name
()
),
json
::
invalid_iterator
&
);
CHECK_THROWS_WITH
(
it
->
type_name
(
),
"[json.exception.invalid_iterator.214] cannot get value"
);
CHECK_THROWS_WITH
(
std
::
string
(
it
->
type_name
()
),
"[json.exception.invalid_iterator.214] cannot get value"
);
}
}
SECTION
(
"object"
)
SECTION
(
"object"
)
{
{
json
j
({{
"foo"
,
"bar"
}});
json
j
({{
"foo"
,
"bar"
}});
json
::
iterator
it
=
j
.
begin
();
json
::
iterator
it
=
j
.
begin
();
CHECK
(
it
->
type_name
(
)
==
"string"
);
CHECK
(
std
::
string
(
it
->
type_name
()
)
==
"string"
);
}
}
SECTION
(
"array"
)
SECTION
(
"array"
)
{
{
json
j
({
1
,
2
,
3
,
4
});
json
j
({
1
,
2
,
3
,
4
});
json
::
iterator
it
=
j
.
begin
();
json
::
iterator
it
=
j
.
begin
();
CHECK
(
it
->
type_name
(
)
==
"number"
);
CHECK
(
std
::
string
(
it
->
type_name
()
)
==
"number"
);
}
}
}
}
}
}
...
...
test/src/unit-convenience.cpp
View file @
3d589fd0
...
@@ -45,15 +45,15 @@ TEST_CASE("convenience functions")
...
@@ -45,15 +45,15 @@ TEST_CASE("convenience functions")
{
{
SECTION
(
"type name as string"
)
SECTION
(
"type name as string"
)
{
{
CHECK
(
json
(
json
::
value_t
::
null
).
type_name
(
)
==
"null"
);
CHECK
(
std
::
string
(
json
(
json
::
value_t
::
null
).
type_name
()
)
==
"null"
);
CHECK
(
json
(
json
::
value_t
::
object
).
type_name
(
)
==
"object"
);
CHECK
(
std
::
string
(
json
(
json
::
value_t
::
object
).
type_name
()
)
==
"object"
);
CHECK
(
json
(
json
::
value_t
::
array
).
type_name
(
)
==
"array"
);
CHECK
(
std
::
string
(
json
(
json
::
value_t
::
array
).
type_name
()
)
==
"array"
);
CHECK
(
json
(
json
::
value_t
::
number_integer
).
type_name
(
)
==
"number"
);
CHECK
(
std
::
string
(
json
(
json
::
value_t
::
number_integer
).
type_name
()
)
==
"number"
);
CHECK
(
json
(
json
::
value_t
::
number_unsigned
).
type_name
(
)
==
"number"
);
CHECK
(
std
::
string
(
json
(
json
::
value_t
::
number_unsigned
).
type_name
()
)
==
"number"
);
CHECK
(
json
(
json
::
value_t
::
number_float
).
type_name
(
)
==
"number"
);
CHECK
(
std
::
string
(
json
(
json
::
value_t
::
number_float
).
type_name
()
)
==
"number"
);
CHECK
(
json
(
json
::
value_t
::
boolean
).
type_name
(
)
==
"boolean"
);
CHECK
(
std
::
string
(
json
(
json
::
value_t
::
boolean
).
type_name
()
)
==
"boolean"
);
CHECK
(
json
(
json
::
value_t
::
string
).
type_name
(
)
==
"string"
);
CHECK
(
std
::
string
(
json
(
json
::
value_t
::
string
).
type_name
()
)
==
"string"
);
CHECK
(
json
(
json
::
value_t
::
discarded
).
type_name
(
)
==
"discarded"
);
CHECK
(
std
::
string
(
json
(
json
::
value_t
::
discarded
).
type_name
()
)
==
"discarded"
);
}
}
SECTION
(
"string escape"
)
SECTION
(
"string escape"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment