From 13fd045dbb2b4dacea32be162a41d5a4b0d1802f Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Tue, 12 Sep 2017 10:32:01 -0700 Subject: Integrated internal changes from Google --- src/google/protobuf/wrappers.pb.h | 97 ++++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 28 deletions(-) (limited to 'src/google/protobuf/wrappers.pb.h') diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 29d6b738..9ed1c0b2 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -30,6 +30,48 @@ #include // IWYU pragma: export #include // @@protoc_insertion_point(includes) + +namespace protobuf_google_2fprotobuf_2fwrappers_2eproto { +// Internal implementation detail -- do not use these members. +struct LIBPROTOBUF_EXPORT TableStruct { + static const ::google::protobuf::internal::ParseTableField entries[]; + static const ::google::protobuf::internal::AuxillaryParseTableField aux[]; + static const ::google::protobuf::internal::ParseTable schema[9]; + static const ::google::protobuf::internal::FieldMetadata field_metadata[]; + static const ::google::protobuf::internal::SerializationTable serialization_table[]; + static const ::google::protobuf::uint32 offsets[]; +}; +void LIBPROTOBUF_EXPORT AddDescriptors(); +void LIBPROTOBUF_EXPORT InitDefaultsDoubleValueImpl(); +void LIBPROTOBUF_EXPORT InitDefaultsDoubleValue(); +void LIBPROTOBUF_EXPORT InitDefaultsFloatValueImpl(); +void LIBPROTOBUF_EXPORT InitDefaultsFloatValue(); +void LIBPROTOBUF_EXPORT InitDefaultsInt64ValueImpl(); +void LIBPROTOBUF_EXPORT InitDefaultsInt64Value(); +void LIBPROTOBUF_EXPORT InitDefaultsUInt64ValueImpl(); +void LIBPROTOBUF_EXPORT InitDefaultsUInt64Value(); +void LIBPROTOBUF_EXPORT InitDefaultsInt32ValueImpl(); +void LIBPROTOBUF_EXPORT InitDefaultsInt32Value(); +void LIBPROTOBUF_EXPORT InitDefaultsUInt32ValueImpl(); +void LIBPROTOBUF_EXPORT InitDefaultsUInt32Value(); +void LIBPROTOBUF_EXPORT InitDefaultsBoolValueImpl(); +void LIBPROTOBUF_EXPORT InitDefaultsBoolValue(); +void LIBPROTOBUF_EXPORT InitDefaultsStringValueImpl(); +void LIBPROTOBUF_EXPORT InitDefaultsStringValue(); +void LIBPROTOBUF_EXPORT InitDefaultsBytesValueImpl(); +void LIBPROTOBUF_EXPORT InitDefaultsBytesValue(); +inline void LIBPROTOBUF_EXPORT InitDefaults() { + InitDefaultsDoubleValue(); + InitDefaultsFloatValue(); + InitDefaultsInt64Value(); + InitDefaultsUInt64Value(); + InitDefaultsInt32Value(); + InitDefaultsUInt32Value(); + InitDefaultsBoolValue(); + InitDefaultsStringValue(); + InitDefaultsBytesValue(); +} +} // namespace protobuf_google_2fprotobuf_2fwrappers_2eproto namespace google { namespace protobuf { class BoolValue; @@ -61,25 +103,9 @@ class UInt64ValueDefaultTypeInternal; LIBPROTOBUF_EXPORT extern UInt64ValueDefaultTypeInternal _UInt64Value_default_instance_; } // namespace protobuf } // namespace google - namespace google { namespace protobuf { -namespace protobuf_google_2fprotobuf_2fwrappers_2eproto { -// Internal implementation detail -- do not call these. -struct LIBPROTOBUF_EXPORT TableStruct { - static const ::google::protobuf::internal::ParseTableField entries[]; - static const ::google::protobuf::internal::AuxillaryParseTableField aux[]; - static const ::google::protobuf::internal::ParseTable schema[]; - static const ::google::protobuf::uint32 offsets[]; - static const ::google::protobuf::internal::FieldMetadata field_metadata[]; - static const ::google::protobuf::internal::SerializationTable serialization_table[]; - static void InitDefaultsImpl(); -}; -void LIBPROTOBUF_EXPORT AddDescriptors(); -void LIBPROTOBUF_EXPORT InitDefaults(); -} // namespace protobuf_google_2fprotobuf_2fwrappers_2eproto - // =================================================================== class LIBPROTOBUF_EXPORT DoubleValue : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DoubleValue) */ { @@ -117,6 +143,7 @@ class LIBPROTOBUF_EXPORT DoubleValue : public ::google::protobuf::Message /* @@p static const ::google::protobuf::Descriptor* descriptor(); static const DoubleValue& default_instance(); + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY static inline const DoubleValue* internal_default_instance() { return reinterpret_cast( &_DoubleValue_default_instance_); @@ -190,7 +217,8 @@ class LIBPROTOBUF_EXPORT DoubleValue : public ::google::protobuf::Message /* @@p typedef void DestructorSkippable_; double value_; mutable int _cached_size_; - friend struct protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend struct ::protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend void ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsDoubleValueImpl(); }; // ------------------------------------------------------------------- @@ -229,6 +257,7 @@ class LIBPROTOBUF_EXPORT FloatValue : public ::google::protobuf::Message /* @@pr static const ::google::protobuf::Descriptor* descriptor(); static const FloatValue& default_instance(); + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY static inline const FloatValue* internal_default_instance() { return reinterpret_cast( &_FloatValue_default_instance_); @@ -302,7 +331,8 @@ class LIBPROTOBUF_EXPORT FloatValue : public ::google::protobuf::Message /* @@pr typedef void DestructorSkippable_; float value_; mutable int _cached_size_; - friend struct protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend struct ::protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend void ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsFloatValueImpl(); }; // ------------------------------------------------------------------- @@ -341,6 +371,7 @@ class LIBPROTOBUF_EXPORT Int64Value : public ::google::protobuf::Message /* @@pr static const ::google::protobuf::Descriptor* descriptor(); static const Int64Value& default_instance(); + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY static inline const Int64Value* internal_default_instance() { return reinterpret_cast( &_Int64Value_default_instance_); @@ -414,7 +445,8 @@ class LIBPROTOBUF_EXPORT Int64Value : public ::google::protobuf::Message /* @@pr typedef void DestructorSkippable_; ::google::protobuf::int64 value_; mutable int _cached_size_; - friend struct protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend struct ::protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend void ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsInt64ValueImpl(); }; // ------------------------------------------------------------------- @@ -453,6 +485,7 @@ class LIBPROTOBUF_EXPORT UInt64Value : public ::google::protobuf::Message /* @@p static const ::google::protobuf::Descriptor* descriptor(); static const UInt64Value& default_instance(); + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY static inline const UInt64Value* internal_default_instance() { return reinterpret_cast( &_UInt64Value_default_instance_); @@ -526,7 +559,8 @@ class LIBPROTOBUF_EXPORT UInt64Value : public ::google::protobuf::Message /* @@p typedef void DestructorSkippable_; ::google::protobuf::uint64 value_; mutable int _cached_size_; - friend struct protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend struct ::protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend void ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsUInt64ValueImpl(); }; // ------------------------------------------------------------------- @@ -565,6 +599,7 @@ class LIBPROTOBUF_EXPORT Int32Value : public ::google::protobuf::Message /* @@pr static const ::google::protobuf::Descriptor* descriptor(); static const Int32Value& default_instance(); + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY static inline const Int32Value* internal_default_instance() { return reinterpret_cast( &_Int32Value_default_instance_); @@ -638,7 +673,8 @@ class LIBPROTOBUF_EXPORT Int32Value : public ::google::protobuf::Message /* @@pr typedef void DestructorSkippable_; ::google::protobuf::int32 value_; mutable int _cached_size_; - friend struct protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend struct ::protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend void ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsInt32ValueImpl(); }; // ------------------------------------------------------------------- @@ -677,6 +713,7 @@ class LIBPROTOBUF_EXPORT UInt32Value : public ::google::protobuf::Message /* @@p static const ::google::protobuf::Descriptor* descriptor(); static const UInt32Value& default_instance(); + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY static inline const UInt32Value* internal_default_instance() { return reinterpret_cast( &_UInt32Value_default_instance_); @@ -750,7 +787,8 @@ class LIBPROTOBUF_EXPORT UInt32Value : public ::google::protobuf::Message /* @@p typedef void DestructorSkippable_; ::google::protobuf::uint32 value_; mutable int _cached_size_; - friend struct protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend struct ::protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend void ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsUInt32ValueImpl(); }; // ------------------------------------------------------------------- @@ -789,6 +827,7 @@ class LIBPROTOBUF_EXPORT BoolValue : public ::google::protobuf::Message /* @@pro static const ::google::protobuf::Descriptor* descriptor(); static const BoolValue& default_instance(); + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY static inline const BoolValue* internal_default_instance() { return reinterpret_cast( &_BoolValue_default_instance_); @@ -862,7 +901,8 @@ class LIBPROTOBUF_EXPORT BoolValue : public ::google::protobuf::Message /* @@pro typedef void DestructorSkippable_; bool value_; mutable int _cached_size_; - friend struct protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend struct ::protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend void ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsBoolValueImpl(); }; // ------------------------------------------------------------------- @@ -901,6 +941,7 @@ class LIBPROTOBUF_EXPORT StringValue : public ::google::protobuf::Message /* @@p static const ::google::protobuf::Descriptor* descriptor(); static const StringValue& default_instance(); + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY static inline const StringValue* internal_default_instance() { return reinterpret_cast( &_StringValue_default_instance_); @@ -985,7 +1026,8 @@ class LIBPROTOBUF_EXPORT StringValue : public ::google::protobuf::Message /* @@p typedef void DestructorSkippable_; ::google::protobuf::internal::ArenaStringPtr value_; mutable int _cached_size_; - friend struct protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend struct ::protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend void ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsStringValueImpl(); }; // ------------------------------------------------------------------- @@ -1024,6 +1066,7 @@ class LIBPROTOBUF_EXPORT BytesValue : public ::google::protobuf::Message /* @@pr static const ::google::protobuf::Descriptor* descriptor(); static const BytesValue& default_instance(); + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY static inline const BytesValue* internal_default_instance() { return reinterpret_cast( &_BytesValue_default_instance_); @@ -1108,14 +1151,14 @@ class LIBPROTOBUF_EXPORT BytesValue : public ::google::protobuf::Message /* @@pr typedef void DestructorSkippable_; ::google::protobuf::internal::ArenaStringPtr value_; mutable int _cached_size_; - friend struct protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend struct ::protobuf_google_2fprotobuf_2fwrappers_2eproto::TableStruct; + friend void ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsBytesValueImpl(); }; // =================================================================== // =================================================================== -#if !PROTOBUF_INLINE_NOT_IN_HEADERS #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wstrict-aliasing" @@ -1405,7 +1448,6 @@ inline void BytesValue::unsafe_arena_set_allocated_value( #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ -#endif // !PROTOBUF_INLINE_NOT_IN_HEADERS // ------------------------------------------------------------------- // ------------------------------------------------------------------- @@ -1425,7 +1467,6 @@ inline void BytesValue::unsafe_arena_set_allocated_value( // @@protoc_insertion_point(namespace_scope) - } // namespace protobuf } // namespace google -- cgit v1.2.3