Skip to content

Commit

Permalink
🐛 reverted change for #464
Browse files Browse the repository at this point in the history
  • Loading branch information
nlohmann committed Feb 20, 2017
1 parent f2dfa09 commit f7075be
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion src/json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3487,7 +3487,6 @@ class basic_json
not std::is_same<ValueType, typename string_t::value_type>::value
#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015
and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
and not std::is_same<ValueType, typename std::string_view>::value
#endif
, int >::type = 0 >
operator ValueType() const
Expand Down
1 change: 0 additions & 1 deletion src/json.hpp.re2c
Original file line number Diff line number Diff line change
Expand Up @@ -3487,7 +3487,6 @@ class basic_json
not std::is_same<ValueType, typename string_t::value_type>::value
#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015
and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
and not std::is_same<ValueType, typename std::string_view>::value
#endif
, int >::type = 0 >
operator ValueType() const
Expand Down

0 comments on commit f7075be

Please sign in to comment.