Commit 5e7bdf1c by gatopeich

Roll-back to hard-coded object_t::value_type

parent fb8c11f2
......@@ -496,12 +496,8 @@ class basic_json
using object_t = ObjectType<StringType,
basic_json,
object_comparator_t,
// Note the use of std::map default allocator as a placeholder
// to extract the actual ObjectType::value_type
AllocatorType<typename
ObjectType<StringType, basic_json, object_comparator_t,
std::allocator<std::pair<const StringType, basic_json>>
>::value_type>>;
// Note: this forces object_t::value_type to match std::map's
AllocatorType<std::pair<const StringType, basic_json>>>;
/*!
@brief a type for an array
......
......@@ -16355,12 +16355,8 @@ class basic_json
using object_t = ObjectType<StringType,
basic_json,
object_comparator_t,
// Note the use of std::map default allocator as a placeholder
// to extract the actual ObjectType::value_type
AllocatorType<typename
ObjectType<StringType, basic_json, object_comparator_t,
std::allocator<std::pair<const StringType, basic_json>>
>::value_type>>;
// Note: this forces object_t::value_type to match std::map's
AllocatorType<std::pair<const StringType, basic_json>>>;
/*!
@brief a type for an array
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment