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
fdecbf6e
Unverified
Commit
fdecbf6e
authored
Mar 05, 2018
by
Niels Lohmann
Committed by
GitHub
Mar 05, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition
fixed misprinted condition detected by PVS Studio.
parents
8d104e6f
fd30ad8a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
json.hpp
include/nlohmann/json.hpp
+1
-1
json.hpp
single_include/nlohmann/json.hpp
+1
-1
No files found.
include/nlohmann/json.hpp
View file @
fdecbf6e
...
@@ -5179,7 +5179,7 @@ class basic_json
...
@@ -5179,7 +5179,7 @@ class basic_json
// passed iterators must belong to objects
// passed iterators must belong to objects
if
(
JSON_UNLIKELY
(
not
first
.
m_object
->
is_object
()
if
(
JSON_UNLIKELY
(
not
first
.
m_object
->
is_object
()
or
not
fir
st
.
m_object
->
is_object
()))
or
not
la
st
.
m_object
->
is_object
()))
{
{
JSON_THROW
(
invalid_iterator
::
create
(
202
,
"iterators first and last must point to objects"
));
JSON_THROW
(
invalid_iterator
::
create
(
202
,
"iterators first and last must point to objects"
));
}
}
...
...
single_include/nlohmann/json.hpp
View file @
fdecbf6e
...
@@ -14777,7 +14777,7 @@ class basic_json
...
@@ -14777,7 +14777,7 @@ class basic_json
// passed iterators must belong to objects
// passed iterators must belong to objects
if
(
JSON_UNLIKELY
(
not
first
.
m_object
->
is_object
()
if
(
JSON_UNLIKELY
(
not
first
.
m_object
->
is_object
()
or
not
fir
st
.
m_object
->
is_object
()))
or
not
la
st
.
m_object
->
is_object
()))
{
{
JSON_THROW
(
invalid_iterator
::
create
(
202
,
"iterators first and last must point to objects"
));
JSON_THROW
(
invalid_iterator
::
create
(
202
,
"iterators first and last must point to objects"
));
}
}
...
...
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