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

🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532)

Browse source
This commit is contained in:
Niels Lohmann 2020-06-08 20:07:15 +02:00
parent 2cf16625ac
commit ae04426c85
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/nlohmann/detail/input/input_adapters.hpp
View file

@ -339,15 +339,18 @@ struct iterator_input_adapter_factory
}
};
// This test breaks astyle formatting when inlined in a template specialization.
template<typename T>
inline constexpr bool is_iterator_of_multibyte()
struct is_iterator_of_multibyte
{
return sizeof(typename std::iterator_traits<T>::value_type) > 1;
}
using value_type = typename std::iterator_traits<T>::value_type;
enum
{
value = sizeof(value_type) > 1
};
};
template<typename IteratorType>
struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>()>>
struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>::value>>
{
using iterator_type = IteratorType;
using char_type = typename std::iterator_traits<iterator_type>::value_type;