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

Roll-back to hard-coded object_t::value_type

Browse source
This commit is contained in:
gatopeich 2020-06-23 15:39:00 +01:00
parent fb8c11f25c
commit 5e7bdf1cab
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/nlohmann/json.hpp
View file

@ -496,12 +496,8 @@ class basic_json
using object_t = ObjectType<StringType, using object_t = ObjectType<StringType,
basic_json, basic_json,
object_comparator_t, object_comparator_t,
// Note the use of std::map default allocator as a placeholder // Note: this forces object_t::value_type to match std::map's
// to extract the actual ObjectType::value_type AllocatorType<std::pair<const StringType, basic_json>>>;
AllocatorType<typename
ObjectType<StringType, basic_json, object_comparator_t,
std::allocator<std::pair<const StringType, basic_json>>
>::value_type>>;
/*! /*!
@brief a type for an array @brief a type for an array

8
single_include/nlohmann/json.hpp
View file

@ -16355,12 +16355,8 @@ class basic_json
using object_t = ObjectType<StringType, using object_t = ObjectType<StringType,
basic_json, basic_json,
object_comparator_t, object_comparator_t,
// Note the use of std::map default allocator as a placeholder // Note: this forces object_t::value_type to match std::map's
// to extract the actual ObjectType::value_type AllocatorType<std::pair<const StringType, basic_json>>>;
AllocatorType<typename
ObjectType<StringType, basic_json, object_comparator_t,
std::allocator<std::pair<const StringType, basic_json>>
>::value_type>>;
/*! /*!
@brief a type for an array @brief a type for an array