j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

reverted change to constexpr get_ref (does not work with GCC and MSVC)

Browse source
This commit is contained in:
Niels 2016-07-22 15:53:38 +02:00
parent 4e7501e59a
commit 51a3829680
2 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/json.hpp
View file

@ -2806,17 +2806,24 @@ class basic_json
type of the current JSON type of the current JSON
*/ */
template<typename ReferenceType, typename ThisType> template<typename ReferenceType, typename ThisType>
static constexpr ReferenceType get_ref_impl(ThisType& obj) static ReferenceType get_ref_impl(ThisType& obj)
{ {
// helper type // helper type
using PointerType = typename std::add_pointer<ReferenceType>::type; using PointerType = typename std::add_pointer<ReferenceType>::type;
// delegate the call to get_ptr<>() // delegate the call to get_ptr<>()
return obj.template get_ptr<PointerType>() != nullptr auto ptr = obj.template get_ptr<PointerType>();
? *obj.template get_ptr<PointerType>()
: throw std::domain_error("incompatible ReferenceType for get_ref, actual type is " + if (ptr != nullptr)
{
return *ptr;
}
else
{
throw std::domain_error("incompatible ReferenceType for get_ref, actual type is " +
obj.type_name()); obj.type_name());
} }
}
public: public:
@ -3043,7 +3050,7 @@ class basic_json
std::is_reference<ReferenceType>::value std::is_reference<ReferenceType>::value
and std::is_const<typename std::remove_reference<ReferenceType>::type>::value and std::is_const<typename std::remove_reference<ReferenceType>::type>::value
, int>::type = 0> , int>::type = 0>
constexpr ReferenceType get_ref() const ReferenceType get_ref() const
{ {
// delegate call to get_ref_impl // delegate call to get_ref_impl
return get_ref_impl<ReferenceType>(*this); return get_ref_impl<ReferenceType>(*this);

17
src/json.hpp.re2c
View file

@ -2806,17 +2806,24 @@ class basic_json
type of the current JSON type of the current JSON
*/ */
template<typename ReferenceType, typename ThisType> template<typename ReferenceType, typename ThisType>
static constexpr ReferenceType get_ref_impl(ThisType& obj) static ReferenceType get_ref_impl(ThisType& obj)
{ {
// helper type // helper type
using PointerType = typename std::add_pointer<ReferenceType>::type; using PointerType = typename std::add_pointer<ReferenceType>::type;
// delegate the call to get_ptr<>() // delegate the call to get_ptr<>()
return obj.template get_ptr<PointerType>() != nullptr auto ptr = obj.template get_ptr<PointerType>();
? *obj.template get_ptr<PointerType>()
: throw std::domain_error("incompatible ReferenceType for get_ref, actual type is " + if (ptr != nullptr)
{
return *ptr;
}
else
{
throw std::domain_error("incompatible ReferenceType for get_ref, actual type is " +
obj.type_name()); obj.type_name());
} }
}
public: public:
@ -3043,7 +3050,7 @@ class basic_json
std::is_reference<ReferenceType>::value std::is_reference<ReferenceType>::value
and std::is_const<typename std::remove_reference<ReferenceType>::type>::value and std::is_const<typename std::remove_reference<ReferenceType>::type>::value
, int>::type = 0> , int>::type = 0>
constexpr ReferenceType get_ref() const ReferenceType get_ref() const
{ {
// delegate call to get_ref_impl // delegate call to get_ref_impl
return get_ref_impl<ReferenceType>(*this); return get_ref_impl<ReferenceType>(*this);