generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-02 07:31:38 +02:00
Code Issues Projects Releases Wiki Activity

Fixed aligned size.

Browse Source
This commit is contained in:
Takatoshi Kondo 2017-07-22 15:35:02 +09:00
parent 354ee5b9a3
commit 64baa15f8e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/msgpack/v1/object.hpp
View File

@ -140,13 +140,17 @@ inline std::size_t aligned_zone_size(msgpack::object const& obj) {
std::size_t s = 0; std::size_t s = 0;
switch (obj.type) { switch (obj.type) {
case msgpack::type::ARRAY: case msgpack::type::ARRAY:
s += sizeof(msgpack::object) * obj.via.array.size; s += msgpack::aligned_size(
sizeof(msgpack::object) * obj.via.array.size,
MSGPACK_ZONE_ALIGNOF(msgpack::object));
for (uint32_t i = 0; i < obj.via.array.size; ++i) { for (uint32_t i = 0; i < obj.via.array.size; ++i) {
s += msgpack::aligned_zone_size(obj.via.array.ptr[i]); s += msgpack::aligned_zone_size(obj.via.array.ptr[i]);
} }
break; break;
case msgpack::type::MAP: case msgpack::type::MAP:
s += sizeof(msgpack::object_kv) * obj.via.map.size; s += msgpack::aligned_size(
sizeof(msgpack::object_kv) * obj.via.map.size,
MSGPACK_ZONE_ALIGNOF(msgpack::object_kv));
for (uint32_t i = 0; i < obj.via.map.size; ++i) { for (uint32_t i = 0; i < obj.via.map.size; ++i) {
s += msgpack::aligned_zone_size(obj.via.map.ptr[i].key); s += msgpack::aligned_zone_size(obj.via.map.ptr[i].key);
s += msgpack::aligned_zone_size(obj.via.map.ptr[i].val); s += msgpack::aligned_zone_size(obj.via.map.ptr[i].val);
@ -155,13 +159,13 @@ inline std::size_t aligned_zone_size(msgpack::object const& obj) {
case msgpack::type::EXT: case msgpack::type::EXT:
s += msgpack::aligned_size( s += msgpack::aligned_size(
detail::add_ext_type_size<sizeof(std::size_t)>(obj.via.ext.size), detail::add_ext_type_size<sizeof(std::size_t)>(obj.via.ext.size),
MSGPACK_ZONE_ALIGNOF(msgpack::object)); MSGPACK_ZONE_ALIGNOF(char));
break; break;
case msgpack::type::STR: case msgpack::type::STR:
s += msgpack::aligned_size(obj.via.str.size, MSGPACK_ZONE_ALIGNOF(msgpack::object)); s += msgpack::aligned_size(obj.via.str.size, MSGPACK_ZONE_ALIGNOF(char));
break; break;
case msgpack::type::BIN: case msgpack::type::BIN:
s += msgpack::aligned_size(obj.via.bin.size, MSGPACK_ZONE_ALIGNOF(msgpack::object)); s += msgpack::aligned_size(obj.via.bin.size, MSGPACK_ZONE_ALIGNOF(char));
break; break;
default: default:
break; break;