Skip to content

Improved templates for std::unordered_map and std::unordered_set so they handle all sorts of those #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
redboltz merged 1 commit into from
Aug 3, 2015
Merged

Improved templates for std::unordered_map and std::unordered_set so they handle all sorts of those #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions include/msgpack/adaptor/cpp11/unordered_map.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,29 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {

namespace adaptor {

template <typename K, typename V>
template <typename K, typename V, typename... OtherTypes>
struct as<
std::unordered_map<K, V>,
std::unordered_map<K, V, OtherTypes...>,
typename std::enable_if<msgpack::has_as<K>::value && msgpack::has_as<V>::value>::type> {
std::unordered_map<K, V> operator()(msgpack::object const& o) const {
std::unordered_map<K, V, OtherTypes...> operator()(msgpack::object const& o) const {
if (o.type != msgpack::type::MAP) { throw msgpack::type_error(); }
msgpack::object_kv* p(o.via.map.ptr);
msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size);
std::unordered_map<K, V> v;
std::unordered_map<K, V, OtherTypes...> v;
for (; p != pend; ++p) {
v.emplace(p->key.as<K>(), p->val.as<V>());
}
return v;
}
};

template <typename K, typename V>
struct convert<std::unordered_map<K, V>> {
msgpack::object const& operator()(msgpack::object const& o, std::unordered_map<K, V>& v) const {
template <typename K, typename V, typename... OtherTypes>
struct convert<std::unordered_map<K, V, OtherTypes...>> {
msgpack::object const& operator()(msgpack::object const& o, std::unordered_map<K, V, OtherTypes...>& v) const {
if(o.type != msgpack::type::MAP) { throw msgpack::type_error(); }
msgpack::object_kv* p(o.via.map.ptr);
msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size);
std::unordered_map<K, V> tmp;
std::unordered_map<K, V, OtherTypes...> tmp;
for(; p != pend; ++p) {
K key;
p->key.convert(key);
Expand All @@ -65,13 +65,13 @@ struct convert<std::unordered_map<K, V>> {
}
};

template <typename K, typename V>
struct pack<std::unordered_map<K, V>> {
template <typename K, typename V, typename... OtherTypes>
struct pack<std::unordered_map<K, V, OtherTypes...>> {
template <typename Stream>
msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::unordered_map<K,V>& v) const {
msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::unordered_map<K, V, OtherTypes...>& v) const {
uint32_t size = checked_get_container_size(v.size());
o.pack_map(size);
for(typename std::unordered_map<K,V>::const_iterator it(v.begin()), it_end(v.end());
for(typename std::unordered_map<K, V, OtherTypes...>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) {
o.pack(it->first);
o.pack(it->second);
Expand All @@ -80,9 +80,9 @@ struct pack<std::unordered_map<K, V>> {
}
};

template <typename K, typename V>
struct object_with_zone<std::unordered_map<K, V>> {
void operator()(msgpack::object::with_zone& o, const std::unordered_map<K,V>& v) const {
template <typename K, typename V, typename... OtherTypes>
struct object_with_zone<std::unordered_map<K, V, OtherTypes...>> {
void operator()(msgpack::object::with_zone& o, const std::unordered_map<K, V, OtherTypes...>& v) const {
o.type = msgpack::type::MAP;
if(v.empty()) {
o.via.map.ptr = nullptr;
Expand All @@ -93,7 +93,7 @@ struct object_with_zone<std::unordered_map<K, V>> {
msgpack::object_kv* const pend = p + size;
o.via.map.ptr = p;
o.via.map.size = size;
typename std::unordered_map<K,V>::const_iterator it(v.begin());
typename std::unordered_map<K, V, OtherTypes...>::const_iterator it(v.begin());
do {
p->key = msgpack::object(it->first, o.zone);
p->val = msgpack::object(it->second, o.zone);
Expand All @@ -105,29 +105,29 @@ struct object_with_zone<std::unordered_map<K, V>> {
};


template <typename K, typename V>
template <typename K, typename V, typename... OtherTypes>
struct as<
std::unordered_multimap<K, V>,
std::unordered_multimap<K, V, OtherTypes...>,
typename std::enable_if<msgpack::has_as<K>::value && msgpack::has_as<V>::value>::type> {
std::unordered_multimap<K, V> operator()(msgpack::object const& o) const {
std::unordered_multimap<K, V, OtherTypes...> operator()(msgpack::object const& o) const {
if (o.type != msgpack::type::MAP) { throw msgpack::type_error(); }
msgpack::object_kv* p(o.via.map.ptr);
msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size);
std::unordered_multimap<K, V> v;
std::unordered_multimap<K, V, OtherTypes...> v;
for (; p != pend; ++p) {
v.emplace(p->key.as<K>(), p->val.as<V>());
}
return v;
}
};

template <typename K, typename V>
struct convert<std::unordered_multimap<K, V>> {
msgpack::object const& operator()(msgpack::object const& o, std::unordered_multimap<K, V>& v) const {
template <typename K, typename V, typename... OtherTypes>
struct convert<std::unordered_multimap<K, V, OtherTypes...>> {
msgpack::object const& operator()(msgpack::object const& o, std::unordered_multimap<K, V, OtherTypes...>& v) const {
if(o.type != msgpack::type::MAP) { throw msgpack::type_error(); }
msgpack::object_kv* p(o.via.map.ptr);
msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size);
std::unordered_multimap<K, V> tmp;
std::unordered_multimap<K, V, OtherTypes...> tmp;
for(; p != pend; ++p) {
std::pair<K, V> value;
p->key.convert(value.first);
Expand All @@ -139,13 +139,13 @@ struct convert<std::unordered_multimap<K, V>> {
}
};

template <typename K, typename V>
struct pack<std::unordered_multimap<K, V>> {
template <typename K, typename V, typename... OtherTypes>
struct pack<std::unordered_multimap<K, V, OtherTypes...>> {
template <typename Stream>
msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::unordered_multimap<K,V>& v) const {
msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::unordered_multimap<K, V, OtherTypes...>& v) const {
uint32_t size = checked_get_container_size(v.size());
o.pack_map(size);
for(typename std::unordered_multimap<K,V>::const_iterator it(v.begin()), it_end(v.end());
for(typename std::unordered_multimap<K, V, OtherTypes...>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) {
o.pack(it->first);
o.pack(it->second);
Expand All @@ -154,9 +154,9 @@ struct pack<std::unordered_multimap<K, V>> {
}
};

template <typename K, typename V>
struct object_with_zone<std::unordered_multimap<K, V>> {
void operator()(msgpack::object::with_zone& o, const std::unordered_multimap<K,V>& v) const {
template <typename K, typename V, typename... OtherTypes>
struct object_with_zone<std::unordered_multimap<K, V, OtherTypes...>> {
void operator()(msgpack::object::with_zone& o, const std::unordered_multimap<K, V, OtherTypes...>& v) const {
o.type = msgpack::type::MAP;
if(v.empty()) {
o.via.map.ptr = nullptr;
Expand All @@ -167,7 +167,7 @@ struct object_with_zone<std::unordered_multimap<K, V>> {
msgpack::object_kv* const pend = p + size;
o.via.map.ptr = p;
o.via.map.size = size;
typename std::unordered_multimap<K,V>::const_iterator it(v.begin());
typename std::unordered_multimap<K, V, OtherTypes...>::const_iterator it(v.begin());
do {
p->key = msgpack::object(it->first, o.zone);
p->val = msgpack::object(it->second, o.zone);
Expand Down
72 changes: 36 additions & 36 deletions include/msgpack/adaptor/cpp11/unordered_set.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,54 +32,54 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {

namespace adaptor {

template <typename T>
struct as<std::unordered_set<T>, typename std::enable_if<msgpack::has_as<T>::value>::type> {
std::unordered_set<T> operator()(msgpack::object const& o) const {
template <typename Key, typename... OtherTypes>
struct as<std::unordered_set<Key, OtherTypes...>, typename std::enable_if<msgpack::has_as<Key>::value>::type> {
std::unordered_set<Key, OtherTypes...> operator()(msgpack::object const& o) const {
if (o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
msgpack::object* p = o.via.array.ptr + o.via.array.size;
msgpack::object* const pbegin = o.via.array.ptr;
std::unordered_set<T> v;
std::unordered_set<Key, OtherTypes...> v;
while (p > pbegin) {
--p;
v.insert(p->as<T>());
v.insert(p->as<Key>());
}
return v;
}
};

template <typename T>
struct convert<std::unordered_set<T>> {
msgpack::object const& operator()(msgpack::object const& o, std::unordered_set<T>& v) const {
template <typename Key, typename... OtherTypes>
struct convert<std::unordered_set<Key, OtherTypes...>> {
msgpack::object const& operator()(msgpack::object const& o, std::unordered_set<Key, OtherTypes...>& v) const {
if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
msgpack::object* p = o.via.array.ptr + o.via.array.size;
msgpack::object* const pbegin = o.via.array.ptr;
std::unordered_set<T> tmp;
std::unordered_set<Key, OtherTypes...> tmp;
while(p > pbegin) {
--p;
tmp.insert(p->as<T>());
tmp.insert(p->as<Key>());
}
v = std::move(tmp);
return o;
}
};

template <typename T>
struct pack<std::unordered_set<T>> {
template <typename Key, typename... OtherTypes>
struct pack<std::unordered_set<Key, OtherTypes...>> {
template <typename Stream>
msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::unordered_set<T>& v) const {
msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::unordered_set<Key, OtherTypes...>& v) const {
uint32_t size = checked_get_container_size(v.size());
o.pack_array(size);
for(typename std::unordered_set<T>::const_iterator it(v.begin()), it_end(v.end());
for(typename std::unordered_set<Key, OtherTypes...>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) {
o.pack(*it);
}
return o;
}
};

template <typename T>
struct object_with_zone<std::unordered_set<T>> {
void operator()(msgpack::object::with_zone& o, const std::unordered_set<T>& v) const {
template <typename Key, typename... OtherTypes>
struct object_with_zone<std::unordered_set<Key, OtherTypes...>> {
void operator()(msgpack::object::with_zone& o, const std::unordered_set<Key, OtherTypes...>& v) const {
o.type = msgpack::type::ARRAY;
if(v.empty()) {
o.via.array.ptr = nullptr;
Expand All @@ -90,7 +90,7 @@ struct object_with_zone<std::unordered_set<T>> {
msgpack::object* const pend = p + size;
o.via.array.ptr = p;
o.via.array.size = size;
typename std::unordered_set<T>::const_iterator it(v.begin());
typename std::unordered_set<Key, OtherTypes...>::const_iterator it(v.begin());
do {
*p = msgpack::object(*it, o.zone);
++p;
Expand All @@ -101,54 +101,54 @@ struct object_with_zone<std::unordered_set<T>> {
};


template <typename T>
struct as<std::unordered_multiset<T>, typename std::enable_if<msgpack::has_as<T>::value>::type> {
std::unordered_multiset<T> operator()(msgpack::object const& o) const {
template <typename Key, typename... OtherTypes>
struct as<std::unordered_multiset<Key, OtherTypes...>, typename std::enable_if<msgpack::has_as<Key>::value>::type> {
std::unordered_multiset<Key, OtherTypes...> operator()(msgpack::object const& o) const {
if (o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
msgpack::object* p = o.via.array.ptr + o.via.array.size;
msgpack::object* const pbegin = o.via.array.ptr;
std::unordered_multiset<T> v;
std::unordered_multiset<Key, OtherTypes...> v;
while (p > pbegin) {
--p;
v.insert(p->as<T>());
v.insert(p->as<Key>());
}
return v;
}
};

template <typename T>
struct convert<std::unordered_multiset<T>> {
msgpack::object const& operator()(msgpack::object const& o, std::unordered_multiset<T>& v) const {
template <typename Key, typename... OtherTypes>
struct convert<std::unordered_multiset<Key, OtherTypes...>> {
msgpack::object const& operator()(msgpack::object const& o, std::unordered_multiset<Key, OtherTypes...>& v) const {
if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
msgpack::object* p = o.via.array.ptr + o.via.array.size;
msgpack::object* const pbegin = o.via.array.ptr;
std::unordered_multiset<T> tmp;
std::unordered_multiset<Key, OtherTypes...> tmp;
while(p > pbegin) {
--p;
tmp.insert(p->as<T>());
tmp.insert(p->as<Key>());
}
v = std::move(tmp);
return o;
}
};

template <typename T>
struct pack<std::unordered_multiset<T>> {
template <typename Key, typename... OtherTypes>
struct pack<std::unordered_multiset<Key, OtherTypes...>> {
template <typename Stream>
msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::unordered_multiset<T>& v) const {
msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::unordered_multiset<Key, OtherTypes...>& v) const {
uint32_t size = checked_get_container_size(v.size());
o.pack_array(size);
for(typename std::unordered_multiset<T>::const_iterator it(v.begin()), it_end(v.end());
for(typename std::unordered_multiset<Key, OtherTypes...>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) {
o.pack(*it);
}
return o;
}
};

template <typename T>
struct object_with_zone<std::unordered_multiset<T>> {
void operator()(msgpack::object::with_zone& o, const std::unordered_multiset<T>& v) const {
template <typename Key, typename... OtherTypes>
struct object_with_zone<std::unordered_multiset<Key, OtherTypes...>> {
void operator()(msgpack::object::with_zone& o, const std::unordered_multiset<Key, OtherTypes...>& v) const {
o.type = msgpack::type::ARRAY;
if(v.empty()) {
o.via.array.ptr = nullptr;
Expand All @@ -159,7 +159,7 @@ struct object_with_zone<std::unordered_multiset<T>> {
msgpack::object* const pend = p + size;
o.via.array.ptr = p;
o.via.array.size = size;
typename std::unordered_multiset<T>::const_iterator it(v.begin());
typename std::unordered_multiset<Key, OtherTypes...>::const_iterator it(v.begin());
do {
*p = msgpack::object(*it, o.zone);
++p;
Expand Down