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
5c1c79b6
Unverified
Commit
5c1c79b6
authored
Mar 29, 2021
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
💚
fix build
parent
203b53d7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
json.hpp
single_include/nlohmann/json.hpp
+4
-2
No files found.
single_include/nlohmann/json.hpp
View file @
5c1c79b6
...
@@ -17949,10 +17949,12 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
...
@@ -17949,10 +17949,12 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
default
:
default
:
{
{
object
=
nullptr
;
// silence warning, see #821
object
=
nullptr
;
// silence warning, see #821
// LCOV_EXCL_START
if
(
JSON_HEDLEY_UNLIKELY
(
t
==
value_t
::
null
))
if
(
JSON_HEDLEY_UNLIKELY
(
t
==
value_t
::
null
))
{
{
JSON_THROW
(
other_error
::
create
(
500
,
"961c151d2e87f2686a955a9be24d316f1362bf21 3.9.1"
,
basic_json
()));
// LCOV_EXCL_LINE
JSON_THROW
(
other_error
::
create
(
500
,
"961c151d2e87f2686a955a9be24d316f1362bf21 3.9.1"
,
basic_json
()));
}
}
// LCOV_EXCL_STOP
break
;
break
;
}
}
}
}
...
@@ -20901,7 +20903,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
...
@@ -20901,7 +20903,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
std
::
is_same
<
KeyType
,
std
::
string_view
>::
value
||
std
::
is_same
<
KeyType
,
std
::
string_view
>::
value
||
#endif
#endif
std
::
is_convertible
<
KeyType
,
typename
object_t
::
key_type
>::
value
),
int
>::
type
=
0
>
std
::
is_convertible
<
KeyType
,
typename
object_t
::
key_type
>::
value
),
int
>::
type
=
0
>
ValueType
value
(
KeyType
&
&
key
,
const
ValueType
&
default_value
)
const
ValueType
value
(
const
KeyType
&
key
,
const
ValueType
&
default_value
)
const
{
{
// at only works for objects
// at only works for objects
if
(
JSON_HEDLEY_LIKELY
(
is_object
()))
if
(
JSON_HEDLEY_LIKELY
(
is_object
()))
...
...
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