Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
d6ff059a
Unverified
Commit
d6ff059a
authored
4 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
addressed review comments
parent
33379684
develop
bon8
coverity_scan
gcc_warning_flags
icpc
issue2932
issue3232_use_catch
master
release/3.10.2
release/3.10.3
release/3.10.4
release/3.10.5
string_view
string_view2
update_doctest
v3.10.5
v3.10.4
v3.10.3
v3.10.2
v3.10.1
v3.10.0
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
include/nlohmann/detail/diagnostics_t.hpp
include/nlohmann/detail/diagnostics_t.hpp
+3
-3
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+3
-3
No files found.
include/nlohmann/detail/diagnostics_t.hpp
View file @
d6ff059a
...
@@ -39,7 +39,7 @@ class diagnostics_t
...
@@ -39,7 +39,7 @@ class diagnostics_t
if
(
current
->
m_parent
->
m_value
.
array
->
operator
[](
i
)
==
*
current
)
if
(
current
->
m_parent
->
m_value
.
array
->
operator
[](
i
)
==
*
current
)
{
{
tokens
.
emplace_back
(
std
::
to_string
(
i
));
tokens
.
emplace_back
(
std
::
to_string
(
i
));
continue
;
break
;
}
}
}
}
break
;
break
;
...
@@ -52,7 +52,7 @@ class diagnostics_t
...
@@ -52,7 +52,7 @@ class diagnostics_t
if
(
element
.
second
==
*
current
)
if
(
element
.
second
==
*
current
)
{
{
tokens
.
emplace_back
(
element
.
first
.
c_str
());
tokens
.
emplace_back
(
element
.
first
.
c_str
());
continue
;
break
;
}
}
}
}
break
;
break
;
...
@@ -79,7 +79,7 @@ class diagnostics_t
...
@@ -79,7 +79,7 @@ class diagnostics_t
}
}
private:
private:
const
BasicJsonType
*
m_j
=
static_cast
<
const
BasicJsonType
*>
(
nullptr
)
;
const
BasicJsonType
*
m_j
=
nullptr
;
};
};
}
// namespace detail
}
// namespace detail
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
d6ff059a
...
@@ -2537,7 +2537,7 @@ class diagnostics_t
...
@@ -2537,7 +2537,7 @@ class diagnostics_t
if
(
current
->
m_parent
->
m_value
.
array
->
operator
[](
i
)
==
*
current
)
if
(
current
->
m_parent
->
m_value
.
array
->
operator
[](
i
)
==
*
current
)
{
{
tokens
.
emplace_back
(
std
::
to_string
(
i
));
tokens
.
emplace_back
(
std
::
to_string
(
i
));
continue
;
break
;
}
}
}
}
break
;
break
;
...
@@ -2550,7 +2550,7 @@ class diagnostics_t
...
@@ -2550,7 +2550,7 @@ class diagnostics_t
if
(
element
.
second
==
*
current
)
if
(
element
.
second
==
*
current
)
{
{
tokens
.
emplace_back
(
element
.
first
.
c_str
());
tokens
.
emplace_back
(
element
.
first
.
c_str
());
continue
;
break
;
}
}
}
}
break
;
break
;
...
@@ -2577,7 +2577,7 @@ class diagnostics_t
...
@@ -2577,7 +2577,7 @@ class diagnostics_t
}
}
private:
private:
const
BasicJsonType
*
m_j
=
static_cast
<
const
BasicJsonType
*>
(
nullptr
)
;
const
BasicJsonType
*
m_j
=
nullptr
;
};
};
}
// namespace detail
}
// namespace detail
...
...
This diff is collapsed.
Click to expand it.
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