generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-29 23:42:40 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #322 from redboltz/fix_320

Browse Source 
Fixed #320. Added gcc version checking.
This commit is contained in:
Takatoshi Kondo 2015-08-03 09:31:56 +09:00
commit e182b06816
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/msgpack/adaptor/vector.hpp
View File

@ -103,14 +103,14 @@ struct object_with_zone<std::vector<T> > {
o.via.array.size = size; o.via.array.size = size;
typename std::vector<T>::const_iterator it(v.begin()); typename std::vector<T>::const_iterator it(v.begin());
do { do {
#if defined(__GNUC__) && !defined(__clang__) #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif // defined(__GNUC__) && !defined(__clang__) #endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
*p = msgpack::object(*it, o.zone); *p = msgpack::object(*it, o.zone);
#if defined(__GNUC__) && !defined(__clang__) #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif // defined(__GNUC__) && !defined(__clang__) #endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
++p; ++p;
++it; ++it;
} while(p < pend); } while(p < pend);