Skip to content

J
json
Commit 5e7bdf1c by gatopeich
Options

Roll-back to hard-coded object_t::value_type

parent fb8c11f2
Showing with 4 additions and 12 deletions
include/nlohmann/json.hpp
...@@ -496,12 +496,8 @@ class basic_json ...@@ -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
......
single_include/nlohmann/json.hpp
...@@ -16355,12 +16355,8 @@ class basic_json ...@@ -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
......
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