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

cleanup after PR #189

Browse source
This commit is contained in:
Niels 2016-01-24 11:00:54 +01:00
parent 21a44da89d
commit 600ad330c5
4 changed files with 755 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

1079
src/json.hpp
View file

File diff suppressed because it is too large Load diff

16
src/json.hpp.re2c
View file

@ -2671,14 +2671,14 @@ class basic_json
@since version 1.0.0
*/
template<typename ValueType, typename
std::enable_if<
not std::is_pointer<ValueType>::value
and not std::is_same<ValueType, typename string_t::value_type>::value
template < typename ValueType, typename
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
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
{
// delegate the call to get<>() const
@ -3081,7 +3081,7 @@ class basic_json
@since version 1.0.0
*/
template<typename T, std::size_t n>
reference operator[](T* (&key)[n])
reference operator[](T * (&key)[n])
{
return operator[](static_cast<const T>(key));
}
@ -3116,7 +3116,7 @@ class basic_json
@since version 1.0.0
*/
template<typename T, std::size_t n>
const_reference operator[](T* (&key)[n]) const
const_reference operator[](T * (&key)[n]) const
{
return operator[](static_cast<const T>(key));
}