subtle fix for get() function

b7478814 · Niels · 7db167af · b7478814 · b7478814
Commit b7478814 authored Apr 03, 2015 by Niels
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

src/json.hpp src/json.hpp +2 -2

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

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -808,7 +808,7 @@ class basic_json
    /// get an object (explicit)
    template <class T, typename
              std::enable_if<
-                  std::is_constructible<string_t, typename T::key_type>::value and
+                  std::is_constructible<typename T::key_type, string_t>::value and
                  std::is_constructible<basic_json, typename T::mapped_type>::value, int>::type
              = 0>
    inline T get() const
@@ -842,7 +842,7 @@ class basic_json
    /// get a string (explicit)
    template <typename T, typename
              std::enable_if<
-                  std::is_constructible<T, string_t>::value, int>::type
+                  std::is_constructible<string_t, T>::value, int>::type
              = 0>
    inline T get() const
    {

--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -808,7 +808,7 @@ class basic_json
    /// get an object (explicit)
    template <class T, typename
              std::enable_if<
-                  std::is_constructible<string_t, typename T::key_type>::value and
+                  std::is_constructible<typename T::key_type, string_t>::value and
                  std::is_constructible<basic_json, typename T::mapped_type>::value, int>::type
              = 0>
    inline T get() const
@@ -842,7 +842,7 @@ class basic_json
    /// get a string (explicit)
    template <typename T, typename
              std::enable_if<
-                  std::is_constructible<T, string_t>::value, int>::type
+                  std::is_constructible<string_t, T>::value, int>::type
              = 0>
    inline T get() const
    {