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

⚗️ remove const from value type

Browse source
This commit is contained in:
Niels Lohmann 2020-06-20 13:23:44 +02:00
parent 4fd0d02b6f
commit 6ee9e5f402
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 37 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
include/nlohmann/ordered_map.hpp
View file

@ -10,14 +10,15 @@ namespace nlohmann
/// ordered_map: a minimal map-like container that preserves insertion order
/// for use within nlohmann::basic_json<ordered_map>
template<class Key, class T, class IgnoredLess = std::less<Key>,
class Allocator = std::allocator<std::pair<const Key, T>>,
class Container = std::vector<std::pair<const Key, T>, Allocator>>
template <class Key, class T, class IgnoredLess = std::less<Key>,
class Allocator = std::allocator<std::pair<Key, T>>,
class Container = std::vector<std::pair<Key, T>, Allocator>>
struct ordered_map : Container
{
using key_type = Key;
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;
std::pair<typename Container::iterator, bool> emplace(key_type&& key, T&& t)
@ -29,33 +30,26 @@ struct ordered_map : Container
return {it, false};
}
}
this->emplace_back(key, t);
Container::emplace_back(key, t);
return {--this->end(), true};
}
std::size_t erase(const key_type& key)
T& operator[](Key&& key)
{
std::size_t result = 0;
for (auto it = this->begin(); it != this->end();)
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)
{
++result;
it = Container::erase(it);
}
else
{
++it;
Container::erase(it);
return 1;
}
}
return result;
}
T& operator[](key_type&& key)
{
return emplace(std::move(key), T{}).first->second;
return 0;
}
};

44
single_include/nlohmann/json.hpp
View file

@ -2777,6 +2777,10 @@ template<class Key, class T, class IgnoredLess, class Allocator, class Container
struct ordered_map;
/*!
@brief ordered JSON class
This type preserves the insertion order of object keys.
@since version 3.9.0
*/
using ordered_json = basic_json<nlohmann::ordered_map>;
@ -15875,17 +15879,18 @@ namespace nlohmann
/// ordered_map: a minimal map-like container that preserves insertion order
/// for use within nlohmann::basic_json<ordered_map>
template<class Key, class T, class IgnoredLess = std::less<Key>,
class Allocator = std::allocator<std::pair<const Key, T>>,
class Container = std::vector<std::pair<const Key, T>, Allocator>>
template <class Key, class T, class IgnoredLess = std::less<Key>,
class Allocator = std::allocator<std::pair<Key, T>>,
class Container = std::vector<std::pair<Key, T>, Allocator>>
struct ordered_map : Container
{
using key_type = Key;
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;
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)
{
@ -15894,33 +15899,26 @@ struct ordered_map : Container
return {it, false};
}
}
this->emplace_back(key, t);
Container::emplace_back(key, t);
return {--this->end(), true};
}
std::size_t erase(const Key& key)
T& operator[](Key&& key)
{
std::size_t result = 0;
for (auto it = this->begin(); it != this->end(); )
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)
{
++result;
it = Container::erase(it);
}
else
{
++it;
Container::erase(it);
return 1;
}
}
return result;
}
T& operator[]( Key&& key )
{
return emplace(std::move(key), T{}).first->second;
return 0;
}
};