generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-19 04:52:59 +01:00
Code Issues Projects Releases Wiki Activity

Added unordered containers support for libc++.

Browse Source
This commit is contained in:
Takatoshi Kondo 2014-02-22 20:43:18 +00:00
parent 28370b36aa
commit 2360466aa9
2 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/msgpack/type/tr1/unordered_map.hpp
View File

@ -19,13 +19,25 @@
#define MSGPACK_TYPE_TR1_UNORDERED_MAP_HPP__ #define MSGPACK_TYPE_TR1_UNORDERED_MAP_HPP__
#include "msgpack/object.hpp" #include "msgpack/object.hpp"
#if defined(_LIBCPP_VERSION)
#include <unordered_map>
#define MSGPACK_STD_TR1 std
#else // _LIBCPP_VERSION
#include <tr1/unordered_map> #include <tr1/unordered_map>
#define MSGPACK_STD_TR1 std::tr1
#endif // _LIBCPP_VERSION
namespace msgpack { namespace msgpack {
template <typename K, typename V> template <typename K, typename V>
inline std::tr1::unordered_map<K, V> operator>> (object o, std::tr1::unordered_map<K, V>& v) inline MSGPACK_STD_TR1::unordered_map<K, V> operator>> (object o, MSGPACK_STD_TR1::unordered_map<K, V>& v)
{ {
if(o.type != type::MAP) { throw type_error(); } if(o.type != type::MAP) { throw type_error(); }
object_kv* p(o.via.map.ptr); object_kv* p(o.via.map.ptr);
@ -39,10 +51,10 @@ inline std::tr1::unordered_map<K, V> operator>> (object o, std::tr1::unordered_m
} }
template <typename Stream, typename K, typename V> template <typename Stream, typename K, typename V>
inline packer<Stream>& operator<< (packer<Stream>& o, const std::tr1::unordered_map<K,V>& v) inline packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_map<K,V>& v)
{ {
o.pack_map(v.size()); o.pack_map(v.size());
for(typename std::tr1::unordered_map<K,V>::const_iterator it(v.begin()), it_end(v.end()); for(typename MSGPACK_STD_TR1::unordered_map<K,V>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) { it != it_end; ++it) {
o.pack(it->first); o.pack(it->first);
o.pack(it->second); o.pack(it->second);
@ -51,7 +63,7 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::tr1::unordered_
} }
template <typename K, typename V> template <typename K, typename V>
inline void operator<< (object::with_zone& o, const std::tr1::unordered_map<K,V>& v) inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_map<K,V>& v)
{ {
o.type = type::MAP; o.type = type::MAP;
if(v.empty()) { if(v.empty()) {
@ -62,7 +74,7 @@ inline void operator<< (object::with_zone& o, const std::tr1::unordered_map<K,V>
object_kv* const pend = p + v.size(); object_kv* const pend = p + v.size();
o.via.map.ptr = p; o.via.map.ptr = p;
o.via.map.size = v.size(); o.via.map.size = v.size();
typename std::tr1::unordered_map<K,V>::const_iterator it(v.begin()); typename MSGPACK_STD_TR1::unordered_map<K,V>::const_iterator it(v.begin());
do { do {
p->key = object(it->first, o.zone); p->key = object(it->first, o.zone);
p->val = object(it->second, o.zone); p->val = object(it->second, o.zone);
@ -74,7 +86,7 @@ inline void operator<< (object::with_zone& o, const std::tr1::unordered_map<K,V>
template <typename K, typename V> template <typename K, typename V>
inline std::tr1::unordered_multimap<K, V> operator>> (object o, std::tr1::unordered_multimap<K, V>& v) inline MSGPACK_STD_TR1::unordered_multimap<K, V> operator>> (object o, MSGPACK_STD_TR1::unordered_multimap<K, V>& v)
{ {
if(o.type != type::MAP) { throw type_error(); } if(o.type != type::MAP) { throw type_error(); }
object_kv* p(o.via.map.ptr); object_kv* p(o.via.map.ptr);
@ -89,10 +101,10 @@ inline std::tr1::unordered_multimap<K, V> operator>> (object o, std::tr1::unorde
} }
template <typename Stream, typename K, typename V> template <typename Stream, typename K, typename V>
inline packer<Stream>& operator<< (packer<Stream>& o, const std::tr1::unordered_multimap<K,V>& v) inline packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_multimap<K,V>& v)
{ {
o.pack_map(v.size()); o.pack_map(v.size());
for(typename std::tr1::unordered_multimap<K,V>::const_iterator it(v.begin()), it_end(v.end()); for(typename MSGPACK_STD_TR1::unordered_multimap<K,V>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) { it != it_end; ++it) {
o.pack(it->first); o.pack(it->first);
o.pack(it->second); o.pack(it->second);
@ -101,7 +113,7 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::tr1::unordered_
} }
template <typename K, typename V> template <typename K, typename V>
inline void operator<< (object::with_zone& o, const std::tr1::unordered_multimap<K,V>& v) inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_multimap<K,V>& v)
{ {
o.type = type::MAP; o.type = type::MAP;
if(v.empty()) { if(v.empty()) {
@ -112,7 +124,7 @@ inline void operator<< (object::with_zone& o, const std::tr1::unordered_multimap
object_kv* const pend = p + v.size(); object_kv* const pend = p + v.size();
o.via.map.ptr = p; o.via.map.ptr = p;
o.via.map.size = v.size(); o.via.map.size = v.size();
typename std::tr1::unordered_multimap<K,V>::const_iterator it(v.begin()); typename MSGPACK_STD_TR1::unordered_multimap<K,V>::const_iterator it(v.begin());
do { do {
p->key = object(it->first, o.zone); p->key = object(it->first, o.zone);
p->val = object(it->second, o.zone); p->val = object(it->second, o.zone);
@ -125,5 +137,7 @@ inline void operator<< (object::with_zone& o, const std::tr1::unordered_multimap
} // namespace msgpack } // namespace msgpack
#undef MSGPACK_STD_TR1
#endif /* msgpack/type/map.hpp */ #endif /* msgpack/type/map.hpp */

33
src/msgpack/type/tr1/unordered_set.hpp
View File

@ -19,13 +19,24 @@
#define MSGPACK_TYPE_TR1_UNORDERED_SET_HPP__ #define MSGPACK_TYPE_TR1_UNORDERED_SET_HPP__
#include "msgpack/object.hpp" #include "msgpack/object.hpp"
#if defined(_LIBCPP_VERSION)
#include <unordered_set>
#define MSGPACK_STD_TR1 std
#else // _LIBCPP_VERSION
#include <tr1/unordered_set> #include <tr1/unordered_set>
#define MSGPACK_STD_TR1 std::tr1
#endif // _LIBCPP_VERSION
namespace msgpack { namespace msgpack {
template <typename T> template <typename T>
inline std::tr1::unordered_set<T>& operator>> (object o, std::tr1::unordered_set<T>& v) inline MSGPACK_STD_TR1::unordered_set<T>& operator>> (object o, MSGPACK_STD_TR1::unordered_set<T>& v)
{ {
if(o.type != type::ARRAY) { throw type_error(); } if(o.type != type::ARRAY) { throw type_error(); }
object* p = o.via.array.ptr + o.via.array.size; object* p = o.via.array.ptr + o.via.array.size;
@ -38,10 +49,10 @@ inline std::tr1::unordered_set<T>& operator>> (object o, std::tr1::unordered_set
} }
template <typename Stream, typename T> template <typename Stream, typename T>
inline packer<Stream>& operator<< (packer<Stream>& o, const std::tr1::unordered_set<T>& v) inline packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_set<T>& v)
{ {
o.pack_array(v.size()); o.pack_array(v.size());
for(typename std::tr1::unordered_set<T>::const_iterator it(v.begin()), it_end(v.end()); for(typename MSGPACK_STD_TR1::unordered_set<T>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) { it != it_end; ++it) {
o.pack(*it); o.pack(*it);
} }
@ -49,7 +60,7 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::tr1::unordered_
} }
template <typename T> template <typename T>
inline void operator<< (object::with_zone& o, const std::tr1::unordered_set<T>& v) inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_set<T>& v)
{ {
o.type = type::ARRAY; o.type = type::ARRAY;
if(v.empty()) { if(v.empty()) {
@ -60,7 +71,7 @@ inline void operator<< (object::with_zone& o, const std::tr1::unordered_set<T>&
object* const pend = p + v.size(); object* const pend = p + v.size();
o.via.array.ptr = p; o.via.array.ptr = p;
o.via.array.size = v.size(); o.via.array.size = v.size();
typename std::tr1::unordered_set<T>::const_iterator it(v.begin()); typename MSGPACK_STD_TR1::unordered_set<T>::const_iterator it(v.begin());
do { do {
*p = object(*it, o.zone); *p = object(*it, o.zone);
++p; ++p;
@ -71,7 +82,7 @@ inline void operator<< (object::with_zone& o, const std::tr1::unordered_set<T>&
template <typename T> template <typename T>
inline std::tr1::unordered_multiset<T>& operator>> (object o, std::tr1::unordered_multiset<T>& v) inline MSGPACK_STD_TR1::unordered_multiset<T>& operator>> (object o, MSGPACK_STD_TR1::unordered_multiset<T>& v)
{ {
if(o.type != type::ARRAY) { throw type_error(); } if(o.type != type::ARRAY) { throw type_error(); }
object* p = o.via.array.ptr + o.via.array.size; object* p = o.via.array.ptr + o.via.array.size;
@ -84,10 +95,10 @@ inline std::tr1::unordered_multiset<T>& operator>> (object o, std::tr1::unordere
} }
template <typename Stream, typename T> template <typename Stream, typename T>
inline packer<Stream>& operator<< (packer<Stream>& o, const std::tr1::unordered_multiset<T>& v) inline packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_multiset<T>& v)
{ {
o.pack_array(v.size()); o.pack_array(v.size());
for(typename std::tr1::unordered_multiset<T>::const_iterator it(v.begin()), it_end(v.end()); for(typename MSGPACK_STD_TR1::unordered_multiset<T>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) { it != it_end; ++it) {
o.pack(*it); o.pack(*it);
} }
@ -95,7 +106,7 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::tr1::unordered_
} }
template <typename T> template <typename T>
inline void operator<< (object::with_zone& o, const std::tr1::unordered_multiset<T>& v) inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_multiset<T>& v)
{ {
o.type = type::ARRAY; o.type = type::ARRAY;
if(v.empty()) { if(v.empty()) {
@ -106,7 +117,7 @@ inline void operator<< (object::with_zone& o, const std::tr1::unordered_multiset
object* const pend = p + v.size(); object* const pend = p + v.size();
o.via.array.ptr = p; o.via.array.ptr = p;
o.via.array.size = v.size(); o.via.array.size = v.size();
typename std::tr1::unordered_multiset<T>::const_iterator it(v.begin()); typename MSGPACK_STD_TR1::unordered_multiset<T>::const_iterator it(v.begin());
do { do {
*p = object(*it, o.zone); *p = object(*it, o.zone);
++p; ++p;
@ -118,5 +129,7 @@ inline void operator<< (object::with_zone& o, const std::tr1::unordered_multiset
} // namespace msgpack } // namespace msgpack
#undef MSGPACK_STD_TR1
#endif /* msgpack/type/set.hpp */ #endif /* msgpack/type/set.hpp */