dnn: Updated protobuf files (3.5.1)

modules/dnn/misc/tensorflow/types.pb.cc

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: types.proto
 
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
 #include "types.pb.h"
 
 #include <algorithm>
@@ -15,60 +14,40 @@
 #include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
+// This is a temporary google only hack
+#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
+#include "third_party/protobuf/version.h"
+#endif
 // @@protoc_insertion_point(includes)
-
 namespace tensorflow {
-
-namespace {
-
-const ::google::protobuf::EnumDescriptor* DataType_descriptor_ = NULL;
-
-}  // namespace
-
-
-void protobuf_AssignDesc_types_2eproto() GOOGLE_ATTRIBUTE_COLD;
-void protobuf_AssignDesc_types_2eproto() {
-  protobuf_AddDesc_types_2eproto();
-  const ::google::protobuf::FileDescriptor* file =
-    ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
-      "types.proto");
-  GOOGLE_CHECK(file != NULL);
-  DataType_descriptor_ = file->enum_type(0);
+}  // namespace tensorflow
+namespace protobuf_types_2eproto {
+const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
+const ::google::protobuf::uint32 TableStruct::offsets[1] = {};
+static const ::google::protobuf::internal::MigrationSchema* schemas = NULL;
+static const ::google::protobuf::Message* const* file_default_instances = NULL;
+
+void protobuf_AssignDescriptors() {
+  AddDescriptors();
+  ::google::protobuf::MessageFactory* factory = NULL;
+  AssignDescriptors(
+      "types.proto", schemas, file_default_instances, TableStruct::offsets, factory,
+      NULL, file_level_enum_descriptors, NULL);
 }
 
-namespace {
-
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
 void protobuf_AssignDescriptorsOnce() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
-                 &protobuf_AssignDesc_types_2eproto);
+  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
+  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
 }
 
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
+void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD;
 void protobuf_RegisterTypes(const ::std::string&) {
   protobuf_AssignDescriptorsOnce();
 }
 
-}  // namespace
-
-void protobuf_ShutdownFile_types_2eproto() {
-}
-
-void protobuf_InitDefaults_types_2eproto_impl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-}
-
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_InitDefaults_types_2eproto_once_);
-void protobuf_InitDefaults_types_2eproto() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_InitDefaults_types_2eproto_once_,
-                 &protobuf_InitDefaults_types_2eproto_impl);
-}
-void protobuf_AddDesc_types_2eproto_impl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  protobuf_InitDefaults_types_2eproto();
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
+void AddDescriptorsImpl() {
+  InitDefaults();
+  static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
       "\n\013types.proto\022\ntensorflow*\234\005\n\010DataType\022\016"
       "\n\nDT_INVALID\020\000\022\014\n\010DT_FLOAT\020\001\022\r\n\tDT_DOUBL"
       "E\020\002\022\014\n\010DT_INT32\020\003\022\014\n\010DT_UINT8\020\004\022\014\n\010DT_IN"
@@ -87,26 +66,29 @@ void protobuf_AddDesc_types_2eproto_impl() {
       "\n\rDT_QINT16_REF\020s\022\022\n\016DT_QUINT16_REF\020t\022\021\n"
       "\rDT_UINT16_REF\020u\022\025\n\021DT_COMPLEX128_REF\020v\022"
       "\017\n\013DT_HALF_REF\020wB,\n\030org.tensorflow.frame"
-    "workB\013TypesProtosP\001\370\001\001b\006proto3", 750);
+      "workB\013TypesProtosP\001\370\001\001b\006proto3"
+  };
+  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
+      descriptor, 750);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "types.proto", &protobuf_RegisterTypes);
-  ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_types_2eproto);
 }
 
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_types_2eproto_once_);
-void protobuf_AddDesc_types_2eproto() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_AddDesc_types_2eproto_once_,
-                 &protobuf_AddDesc_types_2eproto_impl);
+void AddDescriptors() {
+  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
+  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
 }
-// Force AddDescriptors() to be called at static initialization time.
-struct StaticDescriptorInitializer_types_2eproto {
-  StaticDescriptorInitializer_types_2eproto() {
-    protobuf_AddDesc_types_2eproto();
+// Force AddDescriptors() to be called at dynamic initialization time.
+struct StaticDescriptorInitializer {
+  StaticDescriptorInitializer() {
+    AddDescriptors();
   }
-} static_descriptor_initializer_types_2eproto_;
+} static_descriptor_initializer;
+}  // namespace protobuf_types_2eproto
+namespace tensorflow {
 const ::google::protobuf::EnumDescriptor* DataType_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return DataType_descriptor_;
+  protobuf_types_2eproto::protobuf_AssignDescriptorsOnce();
+  return protobuf_types_2eproto::file_level_enum_descriptors[0];
 }
 bool DataType_IsValid(int value) {
   switch (value) {
@@ -157,7 +139,6 @@ bool DataType_IsValid(int value) {
 
 
 // @@protoc_insertion_point(namespace_scope)
-
 }  // namespace tensorflow
 
 // @@protoc_insertion_point(global_scope)

modules/dnn/misc/tensorflow/types.pb.h

@@ -8,34 +8,45 @@
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 3001000
+#if GOOGLE_PROTOBUF_VERSION < 3005000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
 #endif
-#if 3001000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3005001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
 #endif
 
+#include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
+#include <google/protobuf/generated_message_table_driven.h>
 #include <google/protobuf/generated_message_util.h>
 #include <google/protobuf/metadata.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/extension_set.h>
+#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
+#include <google/protobuf/extension_set.h>  // IWYU pragma: export
 #include <google/protobuf/generated_enum_reflection.h>
 // @@protoc_insertion_point(includes)
 
+namespace protobuf_types_2eproto {
+// Internal implementation detail -- do not use these members.
+struct TableStruct {
+  static const ::google::protobuf::internal::ParseTableField entries[];
+  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
+  static const ::google::protobuf::internal::ParseTable schema[1];
+  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
+  static const ::google::protobuf::internal::SerializationTable serialization_table[];
+  static const ::google::protobuf::uint32 offsets[];
+};
+void AddDescriptors();
+inline void InitDefaults() {
+}
+}  // namespace protobuf_types_2eproto
+namespace tensorflow {
+}  // namespace tensorflow
 namespace tensorflow {
-
-// Internal implementation detail -- do not call these.
-void protobuf_AddDesc_types_2eproto();
-void protobuf_InitDefaults_types_2eproto();
-void protobuf_AssignDesc_types_2eproto();
-void protobuf_ShutdownFile_types_2eproto();
-
 
 enum DataType {
   DT_INVALID = 0,
@@ -103,14 +114,18 @@ inline bool DataType_Parse(
 
 // ===================================================================
 
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
+#ifdef __GNUC__
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif  // __GNUC__
+#ifdef __GNUC__
+  #pragma GCC diagnostic pop
+#endif  // __GNUC__
 
 // @@protoc_insertion_point(namespace_scope)
 
 }  // namespace tensorflow
 
-#ifndef SWIG
 namespace google {
 namespace protobuf {
 
@@ -122,7 +137,6 @@ inline const EnumDescriptor* GetEnumDescriptor< ::tensorflow::DataType>() {
 
 }  // namespace protobuf
 }  // namespace google
-#endif  // SWIG
 
 // @@protoc_insertion_point(global_scope)