Skip to content

Commit 99c4d37

Browse files
redboltzredboltz
authored
Merge pull request #574 from redboltz/fix_536
Fixed #536.
2 parents 597cd63 + 4df2bde commit 99c4d37

File tree

7 files changed

+48
-48
lines changed

7 files changed

+48
-48
lines changed

‎include/msgpack/v1/adaptor/array_ref.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,14 +259,14 @@ struct object_with_zone<msgpack::type::array_ref<T> > {
259259
o.via.array.size = size;
260260
typename T::const_iterator it(v.data->begin());
261261
do {
262-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
262+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
263263
#pragma GCC diagnostic push
264264
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
265-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
265+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
266266
*p = msgpack::object(*it, o.zone);
267-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
267+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
268268
#pragma GCC diagnostic pop
269-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
269+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
270270
++p;
271271
++it;
272272
} while(p < pend);

‎include/msgpack/v1/adaptor/map.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,15 @@ struct object_with_zone<std::map<K, V, Compare, Alloc> > {
201201
o.via.map.size = size;
202202
typename std::map<K, V, Compare, Alloc>::const_iterator it(v.begin());
203203
do {
204-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
204+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
205205
#pragma GCC diagnostic push
206206
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
207-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
207+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
208208
p->key = msgpack::object(it->first, o.zone);
209209
p->val = msgpack::object(it->second, o.zone);
210-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
210+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
211211
#pragma GCC diagnostic pop
212-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
212+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
213213
++p;
214214
++it;
215215
} while(p < pend);

‎include/msgpack/v1/adaptor/vector.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ struct object_with_zone<std::vector<T, Alloc> > {
9595
o.via.array.size = size;
9696
typename std::vector<T, Alloc>::const_iterator it(v.begin());
9797
do {
98-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
98+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
9999
#pragma GCC diagnostic push
100100
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
101-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
101+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
102102
*p = msgpack::object(*it, o.zone);
103-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
103+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
104104
#pragma GCC diagnostic pop
105-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
105+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
106106
++p;
107107
++it;
108108
} while(p < pend);

‎include/msgpack/v1/adaptor/vector_char.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ struct convert<std::vector<char, Alloc> > {
3232
case msgpack::type::BIN:
3333
v.resize(o.via.bin.size);
3434
if (o.via.bin.size != 0) {
35-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
35+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
3636
#pragma GCC diagnostic push
3737
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
38-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
38+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
3939
std::memcpy(&v.front(), o.via.bin.ptr, o.via.bin.size);
40-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
40+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
4141
#pragma GCC diagnostic pop
42-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
42+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
4343
}
4444
break;
4545
case msgpack::type::STR:
4646
v.resize(o.via.str.size);
4747
if (o.via.str.size != 0) {
48-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
48+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
4949
#pragma GCC diagnostic push
5050
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
51-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
51+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
5252
std::memcpy(&v.front(), o.via.str.ptr, o.via.str.size);
53-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
53+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
5454
#pragma GCC diagnostic pop
55-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
55+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
5656
}
5757
break;
5858
default:

‎include/msgpack/v1/adaptor/vector_unsigned_char.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ struct convert<std::vector<unsigned char, Alloc> > {
3232
case msgpack::type::BIN:
3333
v.resize(o.via.bin.size);
3434
if (o.via.bin.size != 0) {
35-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
35+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
3636
#pragma GCC diagnostic push
3737
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
38-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
38+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
3939
std::memcpy(&v.front(), o.via.bin.ptr, o.via.bin.size);
40-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
40+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
4141
#pragma GCC diagnostic pop
42-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
42+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
4343
}
4444
break;
4545
case msgpack::type::STR:
4646
v.resize(o.via.str.size);
4747
if (o.via.str.size != 0) {
48-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
48+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
4949
#pragma GCC diagnostic push
5050
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
51-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
51+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
5252
std::memcpy(&v.front(), o.via.str.ptr, o.via.str.size);
53-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
53+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
5454
#pragma GCC diagnostic pop
55-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
55+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
5656
}
5757
break;
5858
default:

‎test/object_with_zone.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -751,14 +751,14 @@ TEST(object_with_zone, user_defined_non_virtual)
751751

752752
msgpack::zone z;
753753
msgpack::object obj(b, z);
754-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
754+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
755755
#pragma GCC diagnostic push
756756
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
757-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
757+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
758758
bottom br = obj.as<bottom>();
759-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
759+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
760760
#pragma GCC diagnostic pop
761-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
761+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
762762
EXPECT_EQ(b.b, br.b);
763763
EXPECT_EQ(b.m1, br.m1);
764764
EXPECT_EQ(b.m2, br.m2);
@@ -796,14 +796,14 @@ TEST(object_with_zone, user_defined_virtual)
796796

797797
msgpack::zone z;
798798
msgpack::object obj(b, z);
799-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
799+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
800800
#pragma GCC diagnostic push
801801
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
802-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
802+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
803803
v_bottom br = obj.as<v_bottom>();
804-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
804+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
805805
#pragma GCC diagnostic pop
806-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
806+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
807807
EXPECT_EQ(b.b, br.b);
808808
EXPECT_EQ(b.m1, br.m1);
809809
EXPECT_EQ(b.m2, br.m2);

‎test/user_class.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ class TestUnionMemberClass
148148

149149
void msgpack_unpack(msgpack::object o)
150150
{
151-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
151+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
152152
#pragma GCC diagnostic push
153153
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
154-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
154+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
155155
msgpack::type::tuple<bool, msgpack::object> tuple;
156156
o.convert(tuple);
157157

@@ -160,18 +160,18 @@ class TestUnionMemberClass
160160
tuple.get<1>().convert(value.f);
161161
else
162162
tuple.get<1>().convert(value.i);
163-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
163+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
164164
#pragma GCC diagnostic pop
165-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
165+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
166166
}
167167
};
168168

169169
TEST(MSGPACK_USER_DEFINED, simple_buffer_union_member)
170170
{
171-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
171+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
172172
#pragma GCC diagnostic push
173173
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
174-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
174+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
175175
{
176176
// double
177177
TestUnionMemberClass val1(1.0);
@@ -195,9 +195,9 @@ TEST(MSGPACK_USER_DEFINED, simple_buffer_union_member)
195195
EXPECT_EQ(val1.value.i, 1);
196196
EXPECT_EQ(val1.value.i, val2.value.i);
197197
}
198-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
198+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
199199
#pragma GCC diagnostic pop
200-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
200+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
201201
}
202202

203203
// inheritance
@@ -396,14 +396,14 @@ TEST(MSGPACK_INHERIT, define_map_non_virtual)
396396
msgpack::pack(sbuf, b);
397397
msgpack::object_handle oh =
398398
msgpack::unpack(sbuf.data(), sbuf.size());
399-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
399+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
400400
#pragma GCC diagnostic push
401401
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
402-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
402+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
403403
dm_bottom br = oh.get().as<dm_bottom>();
404-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
404+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
405405
#pragma GCC diagnostic pop
406-
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
406+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
407407
EXPECT_EQ(b.b, br.b);
408408
EXPECT_EQ(b.m1, br.m1);
409409
EXPECT_EQ(b.m2, br.m2);

0 commit comments

Comments
 (0)