Merge pull request #137 from dariomt/patch-3

Detect correctly pointer-to-const
nlohmann · Oct 20, 2015 · 8f379ef · 8f379ef
2 parents 746c1a7 + 8162a6e
commit 8f379ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
     {

diff --git 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
     {