⚗️ remove const from value type
This commit is contained in:
parent
4fd0d02b6f
commit
6ee9e5f402
2 changed files with 37 additions and 45 deletions
|
@ -11,13 +11,14 @@ namespace nlohmann
|
||||||
/// ordered_map: a minimal map-like container that preserves insertion order
|
/// ordered_map: a minimal map-like container that preserves insertion order
|
||||||
/// for use within nlohmann::basic_json<ordered_map>
|
/// for use within nlohmann::basic_json<ordered_map>
|
||||||
template <class Key, class T, class IgnoredLess = std::less<Key>,
|
template <class Key, class T, class IgnoredLess = std::less<Key>,
|
||||||
class Allocator = std::allocator<std::pair<const Key, T>>,
|
class Allocator = std::allocator<std::pair<Key, T>>,
|
||||||
class Container = std::vector<std::pair<const Key, T>, Allocator>>
|
class Container = std::vector<std::pair<Key, T>, Allocator>>
|
||||||
struct ordered_map : Container
|
struct ordered_map : Container
|
||||||
{
|
{
|
||||||
using key_type = Key;
|
using key_type = Key;
|
||||||
using mapped_type = T;
|
using mapped_type = T;
|
||||||
using value_type = std::pair<const Key, T>;
|
using value_type = typename Container::value_type;
|
||||||
|
using size_type = typename Container::size_type;
|
||||||
using Container::Container;
|
using Container::Container;
|
||||||
|
|
||||||
std::pair<typename Container::iterator, bool> emplace(key_type&& key, T&& t)
|
std::pair<typename Container::iterator, bool> emplace(key_type&& key, T&& t)
|
||||||
|
@ -29,33 +30,26 @@ struct ordered_map : Container
|
||||||
return {it, false};
|
return {it, false};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Container::emplace_back(key, t);
|
||||||
this->emplace_back(key, t);
|
|
||||||
return {--this->end(), true};
|
return {--this->end(), true};
|
||||||
}
|
}
|
||||||
|
|
||||||
std::size_t erase(const key_type& key)
|
T& operator[](Key&& key)
|
||||||
{
|
{
|
||||||
std::size_t result = 0;
|
return emplace(std::move(key), T{}).first->second;
|
||||||
for (auto it = this->begin(); it != this->end();)
|
}
|
||||||
|
|
||||||
|
size_type erase(const Key& key)
|
||||||
|
{
|
||||||
|
for (auto it = this->begin(); it != this->end(); ++it)
|
||||||
{
|
{
|
||||||
if (it->first == key)
|
if (it->first == key)
|
||||||
{
|
{
|
||||||
++result;
|
Container::erase(it);
|
||||||
it = Container::erase(it);
|
return 1;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
++it;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
T& operator[](key_type&& key)
|
|
||||||
{
|
|
||||||
return emplace(std::move(key), T{}).first->second;
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2777,6 +2777,10 @@ template<class Key, class T, class IgnoredLess, class Allocator, class Container
|
||||||
struct ordered_map;
|
struct ordered_map;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@brief ordered JSON class
|
||||||
|
|
||||||
|
This type preserves the insertion order of object keys.
|
||||||
|
|
||||||
@since version 3.9.0
|
@since version 3.9.0
|
||||||
*/
|
*/
|
||||||
using ordered_json = basic_json<nlohmann::ordered_map>;
|
using ordered_json = basic_json<nlohmann::ordered_map>;
|
||||||
|
@ -15876,16 +15880,17 @@ namespace nlohmann
|
||||||
/// ordered_map: a minimal map-like container that preserves insertion order
|
/// ordered_map: a minimal map-like container that preserves insertion order
|
||||||
/// for use within nlohmann::basic_json<ordered_map>
|
/// for use within nlohmann::basic_json<ordered_map>
|
||||||
template <class Key, class T, class IgnoredLess = std::less<Key>,
|
template <class Key, class T, class IgnoredLess = std::less<Key>,
|
||||||
class Allocator = std::allocator<std::pair<const Key, T>>,
|
class Allocator = std::allocator<std::pair<Key, T>>,
|
||||||
class Container = std::vector<std::pair<const Key, T>, Allocator>>
|
class Container = std::vector<std::pair<Key, T>, Allocator>>
|
||||||
struct ordered_map : Container
|
struct ordered_map : Container
|
||||||
{
|
{
|
||||||
using key_type = Key;
|
using key_type = Key;
|
||||||
using mapped_type = T;
|
using mapped_type = T;
|
||||||
using value_type = std::pair<const Key, T>;
|
using value_type = typename Container::value_type;
|
||||||
|
using size_type = typename Container::size_type;
|
||||||
using Container::Container;
|
using Container::Container;
|
||||||
|
|
||||||
std::pair<typename Container::iterator, bool> emplace(Key&& key, T&& t)
|
std::pair<typename Container::iterator, bool> emplace(key_type&& key, T&& t)
|
||||||
{
|
{
|
||||||
for (auto it = this->begin(); it != this->end(); ++it)
|
for (auto it = this->begin(); it != this->end(); ++it)
|
||||||
{
|
{
|
||||||
|
@ -15894,34 +15899,27 @@ struct ordered_map : Container
|
||||||
return {it, false};
|
return {it, false};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Container::emplace_back(key, t);
|
||||||
this->emplace_back(key, t);
|
|
||||||
return {--this->end(), true};
|
return {--this->end(), true};
|
||||||
}
|
}
|
||||||
|
|
||||||
std::size_t erase(const Key& key)
|
|
||||||
{
|
|
||||||
std::size_t result = 0;
|
|
||||||
for (auto it = this->begin(); it != this->end(); )
|
|
||||||
{
|
|
||||||
if (it->first == key)
|
|
||||||
{
|
|
||||||
++result;
|
|
||||||
it = Container::erase(it);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
++it;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
T& operator[](Key&& key)
|
T& operator[](Key&& key)
|
||||||
{
|
{
|
||||||
return emplace(std::move(key), T{}).first->second;
|
return emplace(std::move(key), T{}).first->second;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
size_type erase(const Key& key)
|
||||||
|
{
|
||||||
|
for (auto it = this->begin(); it != this->end(); ++it)
|
||||||
|
{
|
||||||
|
if (it->first == key)
|
||||||
|
{
|
||||||
|
Container::erase(it);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace nlohmann
|
} // namespace nlohmann
|
||||||
|
|
Loading…
Reference in a new issue