From a48e005d510b497be373a9f7e5d9b0d40b06b128 Mon Sep 17 00:00:00 2001 From: Yuriy Chernyshov Date: Thu, 29 Apr 2021 02:51:03 +0500 Subject: [PATCH] Fix -Wundefined-inline error when using SharedCtor() or SharedDtor() (#8532) --- src/google/protobuf/any.pb.h | 4 +- src/google/protobuf/api.pb.h | 12 +- .../protobuf/compiler/cpp/cpp_message.cc | 4 +- src/google/protobuf/compiler/plugin.pb.h | 16 +-- src/google/protobuf/descriptor.pb.h | 108 +++++++++--------- src/google/protobuf/duration.pb.h | 4 +- src/google/protobuf/empty.pb.h | 4 +- src/google/protobuf/field_mask.pb.h | 4 +- src/google/protobuf/source_context.pb.h | 4 +- src/google/protobuf/struct.pb.h | 12 +- src/google/protobuf/timestamp.pb.h | 4 +- src/google/protobuf/type.pb.h | 20 ++-- src/google/protobuf/wrappers.pb.h | 36 +++--- 13 files changed, 116 insertions(+), 116 deletions(-) diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 33419bcbcf..a8e81e6bb6 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -183,8 +183,8 @@ class PROTOBUF_EXPORT Any PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Any* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 15ee4c11a0..889cb4395e 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -160,8 +160,8 @@ class PROTOBUF_EXPORT Api PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Api* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -403,8 +403,8 @@ class PROTOBUF_EXPORT Method PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Method* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -624,8 +624,8 @@ class PROTOBUF_EXPORT Mixin PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Mixin* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc index f2d1aabf5f..b9e2e5f4a8 100644 --- a/src/google/protobuf/compiler/cpp/cpp_message.cc +++ b/src/google/protobuf/compiler/cpp/cpp_message.cc @@ -1341,8 +1341,8 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* printer) { format( "int GetCachedSize() const final { return _cached_size_.Get(); }" "\n\nprivate:\n" - "inline void SharedCtor();\n" - "inline void SharedDtor();\n" + "void SharedCtor();\n" + "void SharedDtor();\n" "void SetCachedSize(int size) const$ full_final$;\n" "void InternalSwap($classname$* other);\n"); diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 67eeabbbca..817a4fb913 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -203,8 +203,8 @@ class PROTOC_EXPORT Version PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Version* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -396,8 +396,8 @@ class PROTOC_EXPORT CodeGeneratorRequest PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(CodeGeneratorRequest* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -610,8 +610,8 @@ class PROTOC_EXPORT CodeGeneratorResponse_File PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(CodeGeneratorResponse_File* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -818,8 +818,8 @@ class PROTOC_EXPORT CodeGeneratorResponse PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(CodeGeneratorResponse* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index c3b7ed22bb..dbd46a7dd7 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -421,8 +421,8 @@ class PROTOBUF_EXPORT FileDescriptorSet PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(FileDescriptorSet* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -568,8 +568,8 @@ class PROTOBUF_EXPORT FileDescriptorProto PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(FileDescriptorProto* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -950,8 +950,8 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(DescriptorProto_ExtensionRange* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -1128,8 +1128,8 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(DescriptorProto_ReservedRange* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -1286,8 +1286,8 @@ class PROTOBUF_EXPORT DescriptorProto PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(DescriptorProto* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -1623,8 +1623,8 @@ class PROTOBUF_EXPORT ExtensionRangeOptions PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(ExtensionRangeOptions* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -1773,8 +1773,8 @@ class PROTOBUF_EXPORT FieldDescriptorProto PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(FieldDescriptorProto* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -2190,8 +2190,8 @@ class PROTOBUF_EXPORT OneofDescriptorProto PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(OneofDescriptorProto* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -2358,8 +2358,8 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(EnumDescriptorProto_EnumReservedRange* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -2516,8 +2516,8 @@ class PROTOBUF_EXPORT EnumDescriptorProto PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(EnumDescriptorProto* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -2752,8 +2752,8 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(EnumValueDescriptorProto* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -2935,8 +2935,8 @@ class PROTOBUF_EXPORT ServiceDescriptorProto PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(ServiceDescriptorProto* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -3123,8 +3123,8 @@ class PROTOBUF_EXPORT MethodDescriptorProto PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MethodDescriptorProto* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -3361,8 +3361,8 @@ class PROTOBUF_EXPORT FileOptions PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(FileOptions* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -3894,8 +3894,8 @@ class PROTOBUF_EXPORT MessageOptions PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MessageOptions* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -4105,8 +4105,8 @@ class PROTOBUF_EXPORT FieldOptions PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(FieldOptions* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -4410,8 +4410,8 @@ class PROTOBUF_EXPORT OneofOptions PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(OneofOptions* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -4560,8 +4560,8 @@ class PROTOBUF_EXPORT EnumOptions PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(EnumOptions* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -4741,8 +4741,8 @@ class PROTOBUF_EXPORT EnumValueOptions PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(EnumValueOptions* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -4907,8 +4907,8 @@ class PROTOBUF_EXPORT ServiceOptions PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(ServiceOptions* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -5073,8 +5073,8 @@ class PROTOBUF_EXPORT MethodOptions PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(MethodOptions* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -5286,8 +5286,8 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(UninterpretedOption_NamePart* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -5452,8 +5452,8 @@ class PROTOBUF_EXPORT UninterpretedOption PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(UninterpretedOption* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -5707,8 +5707,8 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SourceCodeInfo_Location* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -5951,8 +5951,8 @@ class PROTOBUF_EXPORT SourceCodeInfo PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SourceCodeInfo* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -6100,8 +6100,8 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GeneratedCodeInfo_Annotation* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -6303,8 +6303,8 @@ class PROTOBUF_EXPORT GeneratedCodeInfo PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GeneratedCodeInfo* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 1ee55f6068..cd5f43ae01 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -150,8 +150,8 @@ class PROTOBUF_EXPORT Duration PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Duration* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index ade3660cd9..0f1479e265 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -150,8 +150,8 @@ class PROTOBUF_EXPORT Empty PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Empty* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 5d8ec48af2..bdf2d1f124 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -150,8 +150,8 @@ class PROTOBUF_EXPORT FieldMask PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(FieldMask* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 94e517026f..7bc259dbfb 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -150,8 +150,8 @@ class PROTOBUF_EXPORT SourceContext PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SourceContext* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index a6f5e78242..a514482616 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -215,8 +215,8 @@ class PROTOBUF_EXPORT Struct PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Struct* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -369,8 +369,8 @@ class PROTOBUF_EXPORT Value PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Value* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -611,8 +611,8 @@ class PROTOBUF_EXPORT ListValue PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(ListValue* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 020af194f3..50a46c9fb2 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -150,8 +150,8 @@ class PROTOBUF_EXPORT Timestamp PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Timestamp* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index e6a93f1245..fc73c205d0 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -263,8 +263,8 @@ class PROTOBUF_EXPORT Type PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Type* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -496,8 +496,8 @@ class PROTOBUF_EXPORT Field PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Field* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -853,8 +853,8 @@ class PROTOBUF_EXPORT Enum PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Enum* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -1060,8 +1060,8 @@ class PROTOBUF_EXPORT EnumValue PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(EnumValue* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -1227,8 +1227,8 @@ class PROTOBUF_EXPORT Option PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Option* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 9c7d0a0835..dc0e2057cc 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -182,8 +182,8 @@ class PROTOBUF_EXPORT DoubleValue PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(DoubleValue* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -313,8 +313,8 @@ class PROTOBUF_EXPORT FloatValue PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(FloatValue* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -444,8 +444,8 @@ class PROTOBUF_EXPORT Int64Value PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Int64Value* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -575,8 +575,8 @@ class PROTOBUF_EXPORT UInt64Value PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(UInt64Value* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -706,8 +706,8 @@ class PROTOBUF_EXPORT Int32Value PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Int32Value* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -837,8 +837,8 @@ class PROTOBUF_EXPORT UInt32Value PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(UInt32Value* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -968,8 +968,8 @@ class PROTOBUF_EXPORT BoolValue PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(BoolValue* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -1099,8 +1099,8 @@ class PROTOBUF_EXPORT StringValue PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(StringValue* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; @@ -1235,8 +1235,8 @@ class PROTOBUF_EXPORT BytesValue PROTOBUF_FINAL : int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(BytesValue* other); friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;