cleanup after #153

nlohmann · Dec 7, 2015 · 72476b4 · 72476b4 · whackashoe · Dec 7, 2015
1 parent f36f316
commit 72476b4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -381,6 +381,7 @@ I deeply appreciate the help of the following people.
 - [Silverweed](https://github.com/silverweed) overloaded `parse()` to accept an rvalue reference.
 - [dariomt](https://github.com/dariomt) fixed a subtlety in MSVC type support.
 - [ZahlGraf](https://github.com/ZahlGraf) added a workaround that allows compilation using Android NDK.
+- [Eau Claire](https://github.com/whackashoe) replaced a function that was marked as unsafe by Visual Studio.
 
 Thanks a lot for helping out!
 

diff --git a/src/json.hpp b/src/json.hpp
@@ -2404,7 +2404,7 @@ class basic_json
     template<typename PointerType, typename
              std::enable_if<
                  std::is_pointer<PointerType>::value
-                 and std::is_const< typename std::remove_pointer<PointerType>::type >::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
@@ -2404,7 +2404,7 @@ class basic_json
     template<typename PointerType, typename
              std::enable_if<
                  std::is_pointer<PointerType>::value
-                 and std::is_const< typename std::remove_pointer<PointerType>::type >::value
+                 and std::is_const<typename std::remove_pointer<PointerType>::type>::value
                  , int>::type = 0>
     const PointerType get_ptr() const noexcept
     {