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
2b865131
Commit
2b865131
authored
Mar 24, 2021
by
Anthony VH
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing CI errors.
parent
8e79917d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
include/nlohmann/detail/conversions/from_json.hpp
include/nlohmann/detail/conversions/from_json.hpp
+1
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+1
-1
test/src/unit-regression2.cpp
test/src/unit-regression2.cpp
+1
-1
No files found.
include/nlohmann/detail/conversions/from_json.hpp
View file @
2b865131
...
...
@@ -258,7 +258,7 @@ template < typename BasicJsonType, typename T, std::size_t... Idx >
std
::
array
<
T
,
sizeof
...(
Idx
)
>
from_json_inplace_array_impl
(
BasicJsonType
&&
j
,
identity_tag
<
std
::
array
<
T
,
sizeof
...(
Idx
)
>>
/*unused*/
,
index_sequence
<
Idx
...
>
/*unused*/
)
{
return
{
std
::
forward
<
BasicJsonType
>
(
j
).
at
(
Idx
).
template
get
<
T
>()...
};
return
{
{
std
::
forward
<
BasicJsonType
>
(
j
).
at
(
Idx
).
template
get
<
T
>()...
}
};
}
template
<
typename
BasicJsonType
,
typename
T
,
std
::
size_t
N
>
...
...
single_include/nlohmann/json.hpp
View file @
2b865131
...
...
@@ -3991,7 +3991,7 @@ template < typename BasicJsonType, typename T, std::size_t... Idx >
std
::
array
<
T
,
sizeof
...(
Idx
)
>
from_json_inplace_array_impl
(
BasicJsonType
&&
j
,
identity_tag
<
std
::
array
<
T
,
sizeof
...(
Idx
)
>>
/*unused*/
,
index_sequence
<
Idx
...
>
/*unused*/
)
{
return
{
std
::
forward
<
BasicJsonType
>
(
j
).
at
(
Idx
).
template
get
<
T
>()...
};
return
{
{
std
::
forward
<
BasicJsonType
>
(
j
).
at
(
Idx
).
template
get
<
T
>()...
}
};
}
template
<
typename
BasicJsonType
,
typename
T
,
std
::
size_t
N
>
...
...
test/src/unit-regression2.cpp
View file @
2b865131
...
...
@@ -149,7 +149,7 @@ namespace nlohmann
template
<
>
struct
adl_serializer
<
NonDefaultConstructible
>
{
static
NonDefaultConstructible
from_json
(
json
const
&
j
)
noexcept
static
NonDefaultConstructible
from_json
(
json
const
&
j
)
{
return
NonDefaultConstructible
(
j
.
get
<
int
>
());
}
...
...
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