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
7fe16f94
Commit
7fe16f94
authored
Mar 24, 2020
by
garethsb-sony
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PR for #2006 to test in AppVeyor.
parent
19843b03
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
6 deletions
+0
-6
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+0
-3
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+0
-3
No files found.
include/nlohmann/json.hpp
View file @
7fe16f94
...
...
@@ -2921,12 +2921,9 @@ class basic_json
not
std
::
is_same
<
ValueType
,
detail
::
json_ref
<
basic_json
>>::
value
and
not
std
::
is_same
<
ValueType
,
typename
string_t
::
value_type
>::
value
and
not
detail
::
is_basic_json
<
ValueType
>::
value
#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015
and
not
std
::
is_same
<
ValueType
,
std
::
initializer_list
<
typename
string_t
::
value_type
>>::
value
#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER <= 1914))
and
not
std
::
is_same
<
ValueType
,
typename
std
::
string_view
>::
value
#endif
#endif
and
detail
::
is_detected
<
detail
::
get_template_function
,
const
basic_json_t
&
,
ValueType
>::
value
,
int
>::
type
=
0
>
...
...
single_include/nlohmann/json.hpp
View file @
7fe16f94
...
...
@@ -17464,12 +17464,9 @@ class basic_json
not
std
::
is_same
<
ValueType
,
detail
::
json_ref
<
basic_json
>>::
value
and
not
std
::
is_same
<
ValueType
,
typename
string_t
::
value_type
>::
value
and
not
detail
::
is_basic_json
<
ValueType
>::
value
#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015
and
not
std
::
is_same
<
ValueType
,
std
::
initializer_list
<
typename
string_t
::
value_type
>>::
value
#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER <= 1914))
and
not
std
::
is_same
<
ValueType
,
typename
std
::
string_view
>::
value
#endif
#endif
and
detail
::
is_detected
<
detail
::
get_template_function
,
const
basic_json_t
&
,
ValueType
>::
value
,
int
>::
type
=
0
>
...
...
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