Skip to content

J
json
Commit 064a9c92 by gatopeich
Options

Fix regression test

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