Fixed issue #167 - removed operator ValueType() condition for VS2015
This commit is contained in:
parent
f854410542
commit
9de14a4861
2 changed files with 380 additions and 779 deletions
1157
src/json.hpp
1157
src/json.hpp
File diff suppressed because it is too large
Load diff
|
@ -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
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue