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
51a38296
Commit
51a38296
authored
Jul 22, 2016
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reverted change to constexpr get_ref (does not work with GCC and MSVC)
parent
4e7501e5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
12 deletions
+26
-12
src/json.hpp
src/json.hpp
+13
-6
src/json.hpp.re2c
src/json.hpp.re2c
+13
-6
No files found.
src/json.hpp
View file @
51a38296
...
...
@@ -2806,16 +2806,23 @@ class basic_json
type of the current JSON
*/
template
<
typename
ReferenceType
,
typename
ThisType
>
static
constexpr
ReferenceType
get_ref_impl
(
ThisType
&
obj
)
static
ReferenceType
get_ref_impl
(
ThisType
&
obj
)
{
// helper type
using
PointerType
=
typename
std
::
add_pointer
<
ReferenceType
>::
type
;
// delegate the call to get_ptr<>()
return
obj
.
template
get_ptr
<
PointerType
>()
!=
nullptr
?
*
obj
.
template
get_ptr
<
PointerType
>()
:
throw
std
::
domain_error
(
"incompatible ReferenceType for get_ref, actual type is "
+
obj
.
type_name
());
auto
ptr
=
obj
.
template
get_ptr
<
PointerType
>();
if
(
ptr
!=
nullptr
)
{
return
*
ptr
;
}
else
{
throw
std
::
domain_error
(
"incompatible ReferenceType for get_ref, actual type is "
+
obj
.
type_name
());
}
}
public:
...
...
@@ -3043,7 +3050,7 @@ class basic_json
std
::
is_reference
<
ReferenceType
>
::
value
and
std
::
is_const
<
typename
std
::
remove_reference
<
ReferenceType
>::
type
>::
value
,
int
>::
type
=
0
>
constexpr
ReferenceType
get_ref
()
const
ReferenceType
get_ref
()
const
{
// delegate call to get_ref_impl
return
get_ref_impl
<
ReferenceType
>
(
*
this
);
...
...
src/json.hpp.re2c
View file @
51a38296
...
...
@@ -2806,16 +2806,23 @@ class basic_json
type of the current JSON
*/
template<typename ReferenceType, typename ThisType>
static
constexpr
ReferenceType get_ref_impl(ThisType& obj)
static ReferenceType get_ref_impl(ThisType& obj)
{
// helper type
using PointerType = typename std::add_pointer<ReferenceType>::type;
// delegate the call to get_ptr<>()
return obj.template get_ptr<PointerType>() != nullptr
? *obj.template get_ptr<PointerType>()
: throw std::domain_error("incompatible ReferenceType for get_ref, actual type is " +
obj.type_name());
auto ptr = obj.template get_ptr<PointerType>();
if (ptr != nullptr)
{
return *ptr;
}
else
{
throw std::domain_error("incompatible ReferenceType for get_ref, actual type is " +
obj.type_name());
}
}
public:
...
...
@@ -3043,7 +3050,7 @@ class basic_json
std::is_reference<ReferenceType>::value
and std::is_const<typename std::remove_reference<ReferenceType>::type>::value
, int>::type = 0>
constexpr
ReferenceType get_ref() const
ReferenceType get_ref() const
{
// delegate call to get_ref_impl
return get_ref_impl<ReferenceType>(*this);
...
...
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