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
6eb37e9b
Commit
6eb37e9b
authored
4 years ago
by
Anthony VH
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only add conditional constexpr to get() for >= C++14 to work around errors on older compilers.
parent
d7c0f157
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+4
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+4
-1
No files found.
include/nlohmann/json.hpp
View file @
6eb37e9b
...
...
@@ -3063,7 +3063,10 @@ class basic_json
@since version 2.1.0
*/
template
<
typename
ValueTypeCV
,
typename
ValueType
=
detail
::
uncvref_t
<
ValueTypeCV
>
>
constexpr
auto
get
()
const
noexcept
(
#if defined(JSON_HAS_CPP_14)
constexpr
#endif
auto
get
()
const
noexcept
(
noexcept
(
std
::
declval
<
const
basic_json_t
&>
().
template
get_impl
<
ValueType
>(
detail
::
priority_tag
<
4
>
{})))
->
decltype
(
std
::
declval
<
const
basic_json_t
&>
().
template
get_impl
<
ValueType
>(
detail
::
priority_tag
<
4
>
{}))
{
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
6eb37e9b
...
...
@@ -19815,7 +19815,10 @@ class basic_json
@since version 2.1.0
*/
template
<
typename
ValueTypeCV
,
typename
ValueType
=
detail
::
uncvref_t
<
ValueTypeCV
>
>
constexpr
auto
get
()
const
noexcept
(
#if defined(JSON_HAS_CPP_14)
constexpr
#endif
auto
get
()
const
noexcept
(
noexcept
(
std
::
declval
<
const
basic_json_t
&>
().
template
get_impl
<
ValueType
>(
detail
::
priority_tag
<
4
>
{})))
->
decltype
(
std
::
declval
<
const
basic_json_t
&>
().
template
get_impl
<
ValueType
>(
detail
::
priority_tag
<
4
>
{}))
{
...
...
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