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
f2c71faf
Commit
f2c71faf
authored
Jan 14, 2017
by
Théo DELRIEU
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor message/comments tweak
parent
63e4249e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
src/json.hpp
src/json.hpp
+4
-5
No files found.
src/json.hpp
View file @
f2c71faf
...
...
@@ -3027,16 +3027,16 @@ class basic_json
uncvref_t
<
T
>>::
value
,
int
>
=
0
>
// do we really want the uncvref ? if a user call get<int &>, shouldn't we
// i know there is a special behaviour for boolean_t* and such
// static assert ?
// i know there is a special behaviour for boolean_t* and such
auto
get
()
const
noexcept
(
noexcept
(
JSONSerializer
<
uncvref_t
<
T
>>::
from_json
(
std
::
declval
<
basic_json_t
const
&>
(),
std
::
declval
<
uncvref_t
<
T
>
&>
())))
->
uncvref_t
<
T
>
{
using
type
=
uncvref_t
<
T
>
;
static_assert
(
std
::
is_default_constructible
<
type
>::
value
&&
static_assert
(
std
::
is_default_constructible
<
type
>::
value
and
std
::
is_copy_constructible
<
type
>::
value
,
"
user-defined t
ypes must be DefaultConstructible and "
"
T
ypes must be DefaultConstructible and "
"CopyConstructible when used with get"
);
type
ret
;
JSONSerializer
<
type
>::
from_json
(
*
this
,
ret
);
...
...
@@ -3052,12 +3052,11 @@ class basic_json
detail
::
has_non_default_from_json
<
basic_json_t
,
uncvref_t
<
T
>>::
value
,
int
>
=
0
>
constexpr
uncvref_t
<
T
>
get
()
const
noexcept
(
noexcept
(
JSONSerializer
<
T
>::
from_json
(
std
::
declval
<
basic_json_t
const
&>
())))
uncvref_t
<
T
>
get
()
const
noexcept
(
noexcept
(
JSONSerializer
<
T
>::
from_json
(
std
::
declval
<
basic_json_t
const
&>
())))
{
return
JSONSerializer
<
T
>::
from_json
(
*
this
);
}
// TODO what to do with those...
/*!
@brief get a pointer value (explicit)
...
...
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