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
e60002a1
Unverified
Commit
e60002a1
authored
Jul 31, 2017
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
fixed GCC warnings in #663
https://github.com/nlohmann/json/pull/663#issuecomment-318931884
parent
850d856a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
json.hpp
src/json.hpp
+7
-1
No files found.
src/json.hpp
View file @
e60002a1
...
@@ -6872,6 +6872,11 @@ class json_ref
...
@@ -6872,6 +6872,11 @@ class json_ref
is_rvalue
(
true
)
is_rvalue
(
true
)
{}
{}
// class should be movable only
json_ref
(
json_ref
&&
)
=
default
;
json_ref
(
const
json_ref
&
)
=
delete
;
json_ref
&
operator
=
(
const
json_ref
&
)
=
delete
;
value_type
moved_or_copied
()
const
value_type
moved_or_copied
()
const
{
{
if
(
is_rvalue
)
if
(
is_rvalue
)
...
@@ -6895,7 +6900,7 @@ class json_ref
...
@@ -6895,7 +6900,7 @@ class json_ref
}
}
private
:
private
:
mutable
value_type
owned_value
;
mutable
value_type
owned_value
=
nullptr
;
value_type
*
value_ref
=
nullptr
;
value_type
*
value_ref
=
nullptr
;
const
bool
is_rvalue
;
const
bool
is_rvalue
;
};
};
...
@@ -9826,6 +9831,7 @@ class basic_json
...
@@ -9826,6 +9831,7 @@ class basic_json
*/
*/
template
<
typename
ValueType
,
typename
std
::
enable_if
<
template
<
typename
ValueType
,
typename
std
::
enable_if
<
not
std
::
is_pointer
<
ValueType
>::
value
and
not
std
::
is_pointer
<
ValueType
>::
value
and
not
std
::
is_same
<
ValueType
,
detail
::
json_ref
<
basic_json
>>::
value
and
not
std
::
is_same
<
ValueType
,
typename
string_t
::
value_type
>::
value
not
std
::
is_same
<
ValueType
,
typename
string_t
::
value_type
>::
value
#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015
#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
and
not
std
::
is_same
<
ValueType
,
std
::
initializer_list
<
typename
string_t
::
value_type
>>::
value
...
...
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