generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-15 23:20:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'add_msgpack_prefix'

Browse Source 
Conflicts:
	include/msgpack/adaptor/char_ptr.hpp
	include/msgpack/adaptor/cpp11/array.hpp
	include/msgpack/adaptor/cpp11/array_char.hpp
	include/msgpack/adaptor/cpp11/tuple.hpp
	include/msgpack/adaptor/cpp11/unordered_map.hpp
	include/msgpack/adaptor/cpp11/unordered_set.hpp
	include/msgpack/adaptor/deque.hpp
	include/msgpack/adaptor/list.hpp
	include/msgpack/adaptor/map.hpp
	include/msgpack/adaptor/set.hpp
	include/msgpack/adaptor/string.hpp
	include/msgpack/adaptor/tr1/unordered_map.hpp
	include/msgpack/adaptor/tr1/unordered_set.hpp
	include/msgpack/adaptor/vector.hpp
	include/msgpack/adaptor/vector_char.hpp
	include/msgpack/object.hpp
	include/msgpack/unpack.hpp
This commit is contained in:
Nobuyuki Kubota
2015-03-10 20:57:55 +09:00
parent 8eaa2e9e74 f707c6b47c
commit 4b0c90fc90
59 changed files with 2514 additions and 2514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/msgpack/adaptor/vector.hpp
View File

@@ -29,13 +29,13 @@ namespace msgpack {
MSGPACK_API_VERSION_NAMESPACE(v1) {
template <typename T>
inline object const& operator>> (object const& o, std::vector<T>& v)
inline msgpack::object const& operator>> (msgpack::object const& o, std::vector<T>& v)
{
if(o.type != type::ARRAY) { throw type_error(); }
if(o.type != msgpack::type::ARRAY) { throw type_error(); }
v.resize(o.via.array.size);
if(o.via.array.size > 0) {
object* p = o.via.array.ptr;
object* const pend = o.via.array.ptr + o.via.array.size;
msgpack::object* p = o.via.array.ptr;
msgpack::object* const pend = o.via.array.ptr + o.via.array.size;
T* it = &v[0];
do {
p->convert(*it);
@@ -47,7 +47,7 @@ inline object const& operator>> (object const& o, std::vector<T>& v)
}
template <typename Stream, typename T>
inline packer<Stream>& operator<< (packer<Stream>& o, const std::vector<T>& v)
inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::vector<T>& v)
{
uint32_t size = checked_get_container_size(v.size());
o.pack_array(size);
@@ -59,21 +59,21 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::vector<T>& v)
}
template <typename T>
inline void operator<< (object::with_zone& o, const std::vector<T>& v)
inline void operator<< (msgpack::object::with_zone& o, const std::vector<T>& v)
{
o.type = type::ARRAY;
o.type = msgpack::type::ARRAY;
if(v.empty()) {
o.via.array.ptr = nullptr;
o.via.array.size = 0;
} else {
uint32_t size = checked_get_container_size(v.size());
object* p = static_cast<object*>(o.zone.allocate_align(sizeof(object)*size));
object* const pend = p + size;
msgpack::object* p = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*size));
msgpack::object* const pend = p + size;
o.via.array.ptr = p;
o.via.array.size = size;
typename std::vector<T>::const_iterator it(v.begin());
do {
*p = object(*it, o.zone);
*p = msgpack::object(*it, o.zone);
++p;
++it;
} while(p < pend);