Merge remote-tracking branch 'origin/patch-3'

This commit is contained in:
Dario Menendez 2015-10-16 11:23:19 +02:00
commit 8f97e99feb

View file

@ -2385,7 +2385,7 @@ class basic_json
template<typename PointerType, typename template<typename PointerType, typename
std::enable_if< std::enable_if<
std::is_pointer<PointerType>::value std::is_pointer<PointerType>::value
and std::is_const<PointerType>::value and std::is_const< typename std::remove_pointer<PointerType>::type >::value
, int>::type = 0> , int>::type = 0>
const PointerType get_ptr() const noexcept const PointerType get_ptr() const noexcept
{ {