Merge pull request #506 from redboltz/fix_494_user_class

Fixed #494.
Fixed #494 .
2025-10-21 15:51:44 +02:00 · 2016-07-22 20:21:11 +09:00 · 2016-07-22 16:00:50 +09:00 · 2016-07-05 17:17:59 +09:00 · 2016-06-30 21:59:12 +09:00
2 changed files with 21 additions and 0 deletions
--- a/test/object_with_zone.cpp
+++ b/test/object_with_zone.cpp
@@ -742,7 +742,14 @@ TEST(object_with_zone, user_defined_non_virtual)

    msgpack::zone z;
    msgpack::object obj(b, z);
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    bottom br = obj.as<bottom>();
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    EXPECT_EQ(b.b, br.b);
    EXPECT_EQ(b.m1, br.m1);
    EXPECT_EQ(b.m2, br.m2);
@@ -780,7 +787,14 @@ TEST(object_with_zone, user_defined_virtual)

    msgpack::zone z;
    msgpack::object obj(b, z);
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    v_bottom br = obj.as<v_bottom>();
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    EXPECT_EQ(b.b, br.b);
    EXPECT_EQ(b.m1, br.m1);
    EXPECT_EQ(b.m2, br.m2);
--- a/test/user_class.cpp
+++ b/test/user_class.cpp
@@ -382,7 +382,14 @@ TEST(MSGPACK_INHERIT, define_map_non_virtual)
    msgpack::pack(sbuf, b);
    msgpack::unpacked ret;
    msgpack::unpack(ret, sbuf.data(), sbuf.size());
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    dm_bottom br = ret.get().as<dm_bottom>();
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    EXPECT_EQ(b.b, br.b);
    EXPECT_EQ(b.m1, br.m1);
    EXPECT_EQ(b.m2, br.m2);
Author	SHA1	Message	Date
Takatoshi Kondo	b03902d93b	Merge pull request #506 from redboltz/fix_494_user_class Fixed #494.	2016-07-22 20:21:11 +09:00
Takatoshi Kondo	8a2be5b4e9	Fixed #494 . Added false positive warinig suppression code for user_class.cpp.	2016-07-22 16:00:50 +09:00
Takatoshi Kondo	010acda932	Merge pull request #495 from redboltz/fix_494 Fixed #494	2016-07-05 17:17:59 +09:00
Takatoshi Kondo	c951f58531	Fixed #494 Added warning supression code.	2016-06-30 21:59:12 +09:00