make has_mapped_type struct friendly

e9fde3e1 · Vladimir Petrigo · a0ef5a19 · e9fde3e1 · e9fde3e1
Commit e9fde3e1 authored Oct 08, 2016 by Vladimir Petrigo
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 6 deletions

json.hpp src/json.hpp +6 -3

json.hpp.re2c src/json.hpp.re2c +6 -3

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -112,10 +112,13 @@ template<typename T>
 struct has_mapped_type
 {
  private:
-    template<typename C> static char test(typename C::mapped_type*);
-    template<typename C> static char (&test(...))[2];
+    template <typename U, typename = typename U::mapped_type>
+    static int detect(U&&);
+
+    static void detect(...);
  public:
-    static constexpr bool value = sizeof(test<T>(0)) == 1;
+    static constexpr bool value =
+        std::is_integral<decltype(detect(std::declval<T>()))>::value;
 };

 /*!

--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -112,10 +112,13 @@ template<typename T>
 struct has_mapped_type
 {
  private:
-    template<typename C> static char test(typename C::mapped_type*);
-    template<typename C> static char (&test(...))[2];
+    template <typename U, typename = typename U::mapped_type>
+    static int detect(U&&);
+
+    static void detect(...);
  public:
-    static constexpr bool value = sizeof(test<T>(0)) == 1;
+    static constexpr bool value =
+        std::is_integral<decltype(detect(std::declval<T>()))>::value;
 };

 /*!