Skip to content

J
json
Commit acd748e1 by gatopeich
Options

Use std::map default allocator as a placeholder

to extract the actual ObjectType::value_type Still fails on older compilers (GCC <= 5.5)
parent 49623a75
Showing with 12 additions and 6 deletions
include/nlohmann/json.hpp
...@@ -496,9 +496,12 @@ class basic_json ...@@ -496,9 +496,12 @@ class basic_json
using object_t = ObjectType<StringType, using object_t = ObjectType<StringType,
basic_json, basic_json,
object_comparator_t, object_comparator_t,
// Note: instantiating ObjectType with dummy allocator to extract ::value_type // Note the use of std::map default allocator as a placeholder
AllocatorType<typename ObjectType<StringType, basic_json, object_comparator_t, AllocatorType<int> // to extract the actual ObjectType::value_type
>::value_type>>; 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
...@@ -16348,9 +16348,12 @@ class basic_json ...@@ -16348,9 +16348,12 @@ class basic_json
using object_t = ObjectType<StringType, using object_t = ObjectType<StringType,
basic_json, basic_json,
object_comparator_t, object_comparator_t,
// Note: instantiating ObjectType with dummy allocator to extract ::value_type // Note the use of std::map default allocator as a placeholder
AllocatorType<typename ObjectType<StringType, basic_json, object_comparator_t, AllocatorType<int> // to extract the actual ObjectType::value_type
>::value_type>>; 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