mirror of
https://github.com/msgpack/msgpack-c.git
synced 2025-10-13 14:45:38 +02:00

Pass proper alignment size when use allocate_align(). This will fix alignment trap issues on ARM. Signed-off-by: Beilu Shao <beilushao@gmail.com>
91 lines
2.7 KiB
C++
91 lines
2.7 KiB
C++
//
|
|
// MessagePack for C++ static resolution routine
|
|
//
|
|
// Copyright (C) 2015 KONDO Takatoshi
|
|
//
|
|
// Distributed under the Boost Software License, Version 1.0.
|
|
// (See accompanying file LICENSE_1_0.txt or copy at
|
|
// http://www.boost.org/LICENSE_1_0.txt)
|
|
//
|
|
#ifndef MSGPACK_V1_TYPE_VECTOR_BOOL_HPP
|
|
#define MSGPACK_V1_TYPE_VECTOR_BOOL_HPP
|
|
|
|
#include "msgpack/versioning.hpp"
|
|
#include "msgpack/object_fwd.hpp"
|
|
#include "msgpack/adaptor/adaptor_base.hpp"
|
|
|
|
#include <vector>
|
|
|
|
namespace msgpack {
|
|
|
|
/// @cond
|
|
MSGPACK_API_VERSION_NAMESPACE(v1) {
|
|
/// @endcond
|
|
|
|
namespace adaptor {
|
|
|
|
template <typename Alloc>
|
|
struct convert<std::vector<bool, Alloc> > {
|
|
msgpack::object const& operator()(msgpack::object const& o, std::vector<bool, Alloc>& v) const {
|
|
if (o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
|
|
if (o.via.array.size > 0) {
|
|
v.resize(o.via.array.size);
|
|
msgpack::object* p = o.via.array.ptr;
|
|
for (typename std::vector<bool, Alloc>::iterator it = v.begin(), end = v.end();
|
|
it != end;
|
|
++it) {
|
|
*it = p->as<bool>();
|
|
++p;
|
|
}
|
|
}
|
|
return o;
|
|
}
|
|
};
|
|
|
|
template <typename Alloc>
|
|
struct pack<std::vector<bool, Alloc> > {
|
|
template <typename Stream>
|
|
msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::vector<bool, Alloc>& v) const {
|
|
uint32_t size = checked_get_container_size(v.size());
|
|
o.pack_array(size);
|
|
for(typename std::vector<bool, Alloc>::const_iterator it(v.begin()), it_end(v.end());
|
|
it != it_end; ++it) {
|
|
o.pack(static_cast<bool>(*it));
|
|
}
|
|
return o;
|
|
}
|
|
};
|
|
|
|
template <typename Alloc>
|
|
struct object_with_zone<std::vector<bool, Alloc> > {
|
|
void operator()(msgpack::object::with_zone& o, const std::vector<bool, Alloc>& v) const {
|
|
o.type = msgpack::type::ARRAY;
|
|
if(v.empty()) {
|
|
o.via.array.ptr = MSGPACK_NULLPTR;
|
|
o.via.array.size = 0;
|
|
} else {
|
|
uint32_t size = checked_get_container_size(v.size());
|
|
msgpack::object* p = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*size, MSGPACK_ZONE_ALIGNOF(msgpack::object)));
|
|
msgpack::object* const pend = p + size;
|
|
o.via.array.ptr = p;
|
|
o.via.array.size = size;
|
|
typename std::vector<bool, Alloc>::const_iterator it(v.begin());
|
|
do {
|
|
*p = msgpack::object(static_cast<bool>(*it), o.zone);
|
|
++p;
|
|
++it;
|
|
} while(p < pend);
|
|
}
|
|
}
|
|
};
|
|
|
|
} // namespace adaptor
|
|
|
|
/// @cond
|
|
} // MSGPACK_API_VERSION_NAMESPACE(v1)
|
|
/// @endcond
|
|
|
|
} // namespace msgpack
|
|
|
|
#endif // MSGPACK_V1_TYPE_VECTOR_BOOL_HPP
|