Skip to content

Commit baea172

Browse files
committed
Fixed #519.
Suppressed maybe unused warnings.
1 parent e9e31a2 commit baea172

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

test/object_with_zone.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,14 @@ TEST(object_with_zone, user_defined_non_virtual)
749749

750750
msgpack::zone z;
751751
msgpack::object obj(b, z);
752+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
753+
#pragma GCC diagnostic push
754+
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
755+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
752756
bottom br = obj.as<bottom>();
757+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
758+
#pragma GCC diagnostic pop
759+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
753760
EXPECT_EQ(b.b, br.b);
754761
EXPECT_EQ(b.m1, br.m1);
755762
EXPECT_EQ(b.m2, br.m2);
@@ -787,7 +794,14 @@ TEST(object_with_zone, user_defined_virtual)
787794

788795
msgpack::zone z;
789796
msgpack::object obj(b, z);
797+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
798+
#pragma GCC diagnostic push
799+
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
800+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
790801
v_bottom br = obj.as<v_bottom>();
802+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
803+
#pragma GCC diagnostic pop
804+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
791805
EXPECT_EQ(b.b, br.b);
792806
EXPECT_EQ(b.m1, br.m1);
793807
EXPECT_EQ(b.m2, br.m2);

test/user_class.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,14 @@ TEST(MSGPACK_INHERIT, define_map_non_virtual)
389389
msgpack::pack(sbuf, b);
390390
msgpack::object_handle oh =
391391
msgpack::unpack(sbuf.data(), sbuf.size());
392+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
393+
#pragma GCC diagnostic push
394+
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
395+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
392396
dm_bottom br = oh.get().as<dm_bottom>();
397+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
398+
#pragma GCC diagnostic pop
399+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
393400
EXPECT_EQ(b.b, br.b);
394401
EXPECT_EQ(b.m1, br.m1);
395402
EXPECT_EQ(b.m2, br.m2);

0 commit comments

Comments
 (0)