Refined base class pack/unpack support.

Not only C++11 but also C++03 supported.
This commit is contained in:
Takatoshi Kondo
2015-05-01 22:05:23 +09:00
parent e8e3052d1a
commit 7cd77292fc
6 changed files with 160 additions and 165 deletions

View File

@@ -185,80 +185,4 @@ TEST(MSGPACK_USER_DEFINED, simple_buffer_enum_class_member)
EXPECT_EQ(val1.t3, val2.t3);
}
struct top {
int t;
MSGPACK_DEFINE(t);
};
struct mid1 : top {
int m1;
MSGPACK_DEFINE(MSGPACK_BASE(top), m1);
};
struct mid2 : top {
int m2;
MSGPACK_DEFINE(m2, MSGPACK_BASE(top));
};
struct bottom : mid1, mid2 {
int b;
MSGPACK_DEFINE(MSGPACK_BASE(mid1), MSGPACK_BASE(mid2), b);
};
TEST(MSGPACK_INHERIT, simple_buffer_non_virtual)
{
bottom b;
b.b = 1;
b.m1 = 2;
b.m2 = 3;
b.mid1::t = 4;
b.mid2::t = 5;
msgpack::sbuffer sbuf;
msgpack::pack(sbuf, b);
msgpack::unpacked ret = msgpack::unpack(sbuf.data(), sbuf.size());
bottom br = ret.get().as<bottom>();
EXPECT_EQ(b.b, br.b);
EXPECT_EQ(b.m1, br.m1);
EXPECT_EQ(b.m2, br.m2);
EXPECT_EQ(b.mid1::t, br.mid1::t);
EXPECT_EQ(b.mid2::t, br.mid2::t);
}
struct v_top {
int t;
MSGPACK_DEFINE(t);
};
struct v_mid1 : virtual v_top {
int m1;
MSGPACK_DEFINE(m1);
};
struct v_mid2 : virtual v_top {
int m2;
MSGPACK_DEFINE(m2);
};
struct v_bottom : v_mid1, v_mid2 {
int b;
MSGPACK_DEFINE(MSGPACK_BASE(v_mid1), MSGPACK_BASE(v_mid2), MSGPACK_BASE(v_top), b);
};
TEST(MSGPACK_INHERIT, simple_buffer_virtual)
{
v_bottom b;
b.b = 1;
b.m1 = 2;
b.m2 = 3;
b.t = 4;
msgpack::sbuffer sbuf;
msgpack::pack(sbuf, b);
msgpack::unpacked ret = msgpack::unpack(sbuf.data(), sbuf.size());
v_bottom br = ret.get().as<v_bottom>();
EXPECT_EQ(b.b, br.b);
EXPECT_EQ(b.m1, br.m1);
EXPECT_EQ(b.m2, br.m2);
EXPECT_EQ(b.t, br.t);
}
#endif // !defined(MSGPACK_USE_CPP03)