Skip to content

Commit e182b06

Browse files
committed
Merge pull request #322 from redboltz/fix_320
Fixed #320. Added gcc version checking.
2 parents f9a16ad + 4cc1087 commit e182b06

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/msgpack/adaptor/vector.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ struct object_with_zone<std::vector<T> > {
103103
o.via.array.size = size;
104104
typename std::vector<T>::const_iterator it(v.begin());
105105
do {
106-
#if defined(__GNUC__) && !defined(__clang__)
106+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
107107
#pragma GCC diagnostic push
108108
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
109-
#endif // defined(__GNUC__) && !defined(__clang__)
109+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
110110
*p = msgpack::object(*it, o.zone);
111-
#if defined(__GNUC__) && !defined(__clang__)
111+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
112112
#pragma GCC diagnostic pop
113-
#endif // defined(__GNUC__) && !defined(__clang__)
113+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
114114
++p;
115115
++it;
116116
} while(p < pend);

0 commit comments

Comments
 (0)