Merge pull request #137 from dariomt/patch-3

Detect correctly pointer-to-const

Merge pull request #137 from dariomt/patch-3
Detect correctly pointer-to-const
8f379ef3 · Niels · 746c1a71 · 8162a6e3 · 8f379ef3 · 8f379ef3
Commit 8f379ef3 authored Oct 20, 2015 by Niels
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/json.hpp src/json.hpp +1 -1

src/json.hpp.re2c src/json.hpp.re2c +1 -1

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -2385,7 +2385,7 @@ class basic_json
    template<typename PointerType, typename
             std::enable_if<
                 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>
    const PointerType get_ptr() const noexcept
    {

--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -2385,7 +2385,7 @@ class basic_json
    template<typename PointerType, typename
             std::enable_if<
                 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>
    const PointerType get_ptr() const noexcept
    {