Fixed issue #167 - removed operator ValueType() condition for VS2015

9de14a48 · Trevor Welsby · f8544105 · 9de14a48 · 9de14a48
Commit 9de14a48 authored Jan 23, 2016 by Trevor Welsby
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 335 additions and 734 deletions

src/json.hpp src/json.hpp +333 -734

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

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -2675,7 +2675,9 @@ class basic_json
             std::enable_if<
                 not std::is_pointer<ValueType>::value
                 and not std::is_same<ValueType, typename string_t::value_type>::value
+#ifndef _MSC_VER  // Fix for issue #167 operator<< abiguity under VS2015
                 and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
+#endif
                 , int>::type = 0>
    operator ValueType() const
    {