From 710352234426a869b5ebd4f2e5ff8c71ccd6bc07 Mon Sep 17 00:00:00 2001
From: Jacob Potter <j4cbo@dropbox.com>
Date: Wed, 13 Aug 2014 14:58:20 -0700
Subject: [PATCH] Identify map- and vector-like objects in a VS14-compatible
 way

---
 json11.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/json11.hpp b/json11.hpp
index 779445e..fe9bba4 100644
--- a/json11.hpp
+++ b/json11.hpp
@@ -91,14 +91,14 @@ public:
 
     // Implicit constructor: map-like objects (std::map, std::unordered_map, etc)
     template <class M, typename std::enable_if<
-        std::is_constructible<std::string, decltype(std::declval<M>().begin()->first)>::value
-        && std::is_constructible<Json, decltype(std::declval<M>().begin()->second)>::value,
+        std::is_constructible<std::string, typename M::key_type>::value
+        && std::is_constructible<Json, typename M::mapped_type>::value,
             int>::type = 0>
     Json(const M & m) : Json(object(m.begin(), m.end())) {}
 
     // Implicit constructor: vector-like objects (std::list, std::vector, std::set, etc)
     template <class V, typename std::enable_if<
-        std::is_constructible<Json, decltype(*std::declval<V>().begin())>::value,
+        std::is_constructible<Json, typename V::value_type>::value,
             int>::type = 0>
     Json(const V & v) : Json(array(v.begin(), v.end())) {}