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
ebb3c032
Unverified
Commit
ebb3c032
authored
6 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup after #1228
parent
d3428b35
develop
bon8
coverity_scan
feature/optional
gcc_warning_flags
icpc
issue2228
issue2615
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
3.6.1
3.3.0
v3.10.5
v3.10.4
v3.10.3
v3.10.2
v3.10.1
v3.10.0
v3.9.1
v3.9.0
v3.8.0
v3.7.3
v3.7.2
v3.7.1
v3.7.0
v3.6.1
v3.6.0
v3.5.0
v3.4.0
v3.3.0
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
include/nlohmann/detail/conversions/from_json.hpp
include/nlohmann/detail/conversions/from_json.hpp
+2
-2
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+2
-2
No files found.
include/nlohmann/detail/conversions/from_json.hpp
View file @
ebb3c032
...
...
@@ -218,8 +218,8 @@ template <typename BasicJsonType, typename CompatibleArrayType,
auto
from_json
(
const
BasicJsonType
&
j
,
CompatibleArrayType
&
arr
)
->
decltype
(
from_json_array_impl
(
j
,
arr
,
priority_tag
<
3
>
{}),
j
.
template
get
<
typename
CompatibleArrayType
::
value_type
>(),
void
())
j
.
template
get
<
typename
CompatibleArrayType
::
value_type
>(),
void
())
{
if
(
JSON_UNLIKELY
(
not
j
.
is_array
()))
{
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
ebb3c032
...
...
@@ -1232,8 +1232,8 @@ template <typename BasicJsonType, typename CompatibleArrayType,
auto
from_json
(
const
BasicJsonType
&
j
,
CompatibleArrayType
&
arr
)
->
decltype
(
from_json_array_impl
(
j
,
arr
,
priority_tag
<
3
>
{}),
j
.
template
get
<
typename
CompatibleArrayType
::
value_type
>(),
void
())
j
.
template
get
<
typename
CompatibleArrayType
::
value_type
>(),
void
())
{
if
(
JSON_UNLIKELY
(
not
j
.
is_array
()))
{
...
...
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