protocolbuffers · teeks99 · Jan 9, 2018 · May 24, 2018 · May 24, 2018
diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
diff --git a/src/google/protobuf/compiler/cpp/cpp_file.cc b/src/google/protobuf/compiler/cpp/cpp_file.cc
@@ -1363,7 +1363,7 @@ void FileGenerator::GenerateInlineFunctionDefinitions(io::Printer* printer) {
   // TODO(gerbens) remove pragmas when gcc is no longer used. Current version
   // of gcc fires a bogus error when compiled with strict-aliasing.
   printer->Print(
-    "#ifdef __GNUC__\n"
+    "#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)\n"
     "  #pragma GCC diagnostic push\n"
     "  #pragma GCC diagnostic ignored \"-Wstrict-aliasing\"\n"
     "#endif  // __GNUC__\n");
@@ -1376,7 +1376,7 @@ void FileGenerator::GenerateInlineFunctionDefinitions(io::Printer* printer) {
     message_generators_[i]->GenerateInlineMethods(printer);
   }
   printer->Print(
-    "#ifdef __GNUC__\n"
+    "#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)\n"
     "  #pragma GCC diagnostic pop\n"
     "#endif  // __GNUC__\n");
 

diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
diff --git a/third_party/benchmark b/third_party/benchmark