aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor.pb.h
diff options
context:
space:
mode:
authorTom Kent <teeks99@yahoo.com>2018-07-06 17:52:14 -0500
committerFeng Xiao <xfxyjwf@gmail.com>2018-07-06 15:52:14 -0700
commitc934cb7eaff31aff63c10f4336dcfc5e6c45d6a3 (patch)
treeeb186b122c1cfbcb3a47551ae9c0f388f9f316d7 /src/google/protobuf/descriptor.pb.h
parentfe773bfe97854c4be95b1b6e66281c0868194269 (diff)
downloadprotobuf-c934cb7eaff31aff63c10f4336dcfc5e6c45d6a3.tar.gz
protobuf-c934cb7eaff31aff63c10f4336dcfc5e6c45d6a3.tar.bz2
protobuf-c934cb7eaff31aff63c10f4336dcfc5e6c45d6a3.zip
Guards for older GCC versions (#4870)
Guards for older GCC versions.
Diffstat (limited to 'src/google/protobuf/descriptor.pb.h')
-rw-r--r--src/google/protobuf/descriptor.pb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index 4ed5cac9..533b192d 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -5677,7 +5677,7 @@ class LIBPROTOBUF_EXPORT GeneratedCodeInfo : public ::google::protobuf::Message
// ===================================================================
-#ifdef __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif // __GNUC__
@@ -11394,7 +11394,7 @@ GeneratedCodeInfo::annotation() const {
return annotation_;
}
-#ifdef __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
#pragma GCC diagnostic pop
#endif // __GNUC__
// -------------------------------------------------------------------