Use std::map default allocator as a placeholder

to extract the actual ObjectType::value_type Still fails on older compilers (GCC <= 5.5)
nlohmann · Jun 23, 2020 · acd748e · acd748e
1 parent 49623a7
commit acd748e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
@@ -496,9 +496,12 @@ class basic_json
     using object_t = ObjectType<StringType,
           basic_json,
           object_comparator_t,
-          // Note: instantiating ObjectType with dummy allocator to extract ::value_type
-          AllocatorType<typename ObjectType<StringType, basic_json, object_comparator_t, AllocatorType<int>
-                                            >::value_type>>;
+          // 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>>;
 
     /*!
     @brief a type for an array

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -16348,9 +16348,12 @@ class basic_json
     using object_t = ObjectType<StringType,
           basic_json,
           object_comparator_t,
-          // Note: instantiating ObjectType with dummy allocator to extract ::value_type
-          AllocatorType<typename ObjectType<StringType, basic_json, object_comparator_t, AllocatorType<int>
-                                            >::value_type>>;
+          // 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>>;
 
     /*!
     @brief a type for an array