j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Trevor Welsby 2016-01-23 16:34:15 +10:00
parent f854410542
commit 9de14a4861
2 changed files with 380 additions and 779 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1157
src/json.hpp
View file

File diff suppressed because it is too large Load diff

2
src/json.hpp.re2c
View file

@ -2675,7 +2675,9 @@ class basic_json
std::enable_if< std::enable_if<
not std::is_pointer<ValueType>::value not std::is_pointer<ValueType>::value
and not std::is_same<ValueType, typename string_t::value_type>::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 and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
#endif
, int>::type = 0> , int>::type = 0>
operator ValueType() const operator ValueType() const
{ {