j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Re-implement ordered_map::erase,

Browse source 
so that it can handle pair<const Key,...>
This commit is contained in:
gatopeich 2020-06-23 15:01:20 +01:00
parent acd748e16f
commit fb8c11f25c
3 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/nlohmann/json.hpp
View file

@ -499,9 +499,9 @@ class basic_json
// Note the use of std::map default allocator as a placeholder // Note the use of std::map default allocator as a placeholder
// to extract the actual ObjectType::value_type // to extract the actual ObjectType::value_type
AllocatorType<typename AllocatorType<typename
ObjectType<StringType,basic_json,object_comparator_t, ObjectType<StringType, basic_json, object_comparator_t,
std::allocator<std::pair<const StringType, basic_json>> std::allocator<std::pair<const StringType, basic_json>>
>::value_type>>; >::value_type>>;
/*! /*!
@brief a type for an array @brief a type for an array

9
include/nlohmann/ordered_map.hpp
View file

@ -46,7 +46,14 @@ struct ordered_map : Container
{ {
if (it->first == key) if (it->first == key)
{ {
Container::erase(it); // Since we cannot move const Keys, re-construct them in place
for (auto next = it; ++next != this->end(); ++it)
{
// *it = std::move(*next); // deleted
it->~value_type(); // Destroy but keep allocation
new (&*it) value_type{std::move(*next)};
}
Container::pop_back();
return 1; return 1;
} }
} }

15
single_include/nlohmann/json.hpp
View file

@ -15915,7 +15915,14 @@ struct ordered_map : Container
{ {
if (it->first == key) if (it->first == key)
{ {
Container::erase(it); // Since we cannot move const Keys, re-construct them in place
for (auto next = it; ++next != this->end(); ++it)
{
// *it = std::move(*next); // deleted
it->~value_type(); // Destroy but keep allocation
new (&*it) value_type{std::move(*next)};
}
Container::pop_back();
return 1; return 1;
} }
} }
@ -16351,9 +16358,9 @@ class basic_json
// Note the use of std::map default allocator as a placeholder // Note the use of std::map default allocator as a placeholder
// to extract the actual ObjectType::value_type // to extract the actual ObjectType::value_type
AllocatorType<typename AllocatorType<typename
ObjectType<StringType,basic_json,object_comparator_t, ObjectType<StringType, basic_json, object_comparator_t,
std::allocator<std::pair<const StringType, basic_json>> std::allocator<std::pair<const StringType, basic_json>>
>::value_type>>; >::value_type>>;
/*! /*!
@brief a type for an array @brief a type for an array