| Index: third_party/protobuf/src/google/protobuf/descriptor.pb.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/descriptor.pb.h b/third_party/protobuf/src/google/protobuf/descriptor.pb.h
|
| index e9990d14721819e9d7a91172452d120b54935280..6025516258adaa0366a71d8cebbaeace026e4467 100644
|
| --- a/third_party/protobuf/src/google/protobuf/descriptor.pb.h
|
| +++ b/third_party/protobuf/src/google/protobuf/descriptor.pb.h
|
| @@ -8,18 +8,21 @@
|
|
|
| #include <google/protobuf/stubs/common.h>
|
|
|
| -#if GOOGLE_PROTOBUF_VERSION < 2005000
|
| +#if GOOGLE_PROTOBUF_VERSION < 3000000
|
| #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 2005000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
|
| +#if 3000000 < 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/arena.h>
|
| +#include <google/protobuf/arenastring.h>
|
| #include <google/protobuf/generated_message_util.h>
|
| +#include <google/protobuf/metadata.h>
|
| #include <google/protobuf/message.h>
|
| #include <google/protobuf/repeated_field.h>
|
| #include <google/protobuf/extension_set.h>
|
| @@ -35,26 +38,28 @@ void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(
|
| void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| -class FileDescriptorSet;
|
| -class FileDescriptorProto;
|
| class DescriptorProto;
|
| class DescriptorProto_ExtensionRange;
|
| -class FieldDescriptorProto;
|
| +class DescriptorProto_ReservedRange;
|
| class EnumDescriptorProto;
|
| +class EnumOptions;
|
| class EnumValueDescriptorProto;
|
| -class ServiceDescriptorProto;
|
| -class MethodDescriptorProto;
|
| +class EnumValueOptions;
|
| +class FieldDescriptorProto;
|
| +class FieldOptions;
|
| +class FileDescriptorProto;
|
| +class FileDescriptorSet;
|
| class FileOptions;
|
| class MessageOptions;
|
| -class FieldOptions;
|
| -class EnumOptions;
|
| -class EnumValueOptions;
|
| -class ServiceOptions;
|
| +class MethodDescriptorProto;
|
| class MethodOptions;
|
| -class UninterpretedOption;
|
| -class UninterpretedOption_NamePart;
|
| +class OneofDescriptorProto;
|
| +class ServiceDescriptorProto;
|
| +class ServiceOptions;
|
| class SourceCodeInfo;
|
| class SourceCodeInfo_Location;
|
| +class UninterpretedOption;
|
| +class UninterpretedOption_NamePart;
|
|
|
| enum FieldDescriptorProto_Type {
|
| FieldDescriptorProto_Type_TYPE_DOUBLE = 1,
|
| @@ -151,6 +156,26 @@ inline bool FieldOptions_CType_Parse(
|
| return ::google::protobuf::internal::ParseNamedEnum<FieldOptions_CType>(
|
| FieldOptions_CType_descriptor(), name, value);
|
| }
|
| +enum FieldOptions_JSType {
|
| + FieldOptions_JSType_JS_NORMAL = 0,
|
| + FieldOptions_JSType_JS_STRING = 1,
|
| + FieldOptions_JSType_JS_NUMBER = 2
|
| +};
|
| +LIBPROTOBUF_EXPORT bool FieldOptions_JSType_IsValid(int value);
|
| +const FieldOptions_JSType FieldOptions_JSType_JSType_MIN = FieldOptions_JSType_JS_NORMAL;
|
| +const FieldOptions_JSType FieldOptions_JSType_JSType_MAX = FieldOptions_JSType_JS_NUMBER;
|
| +const int FieldOptions_JSType_JSType_ARRAYSIZE = FieldOptions_JSType_JSType_MAX + 1;
|
| +
|
| +LIBPROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* FieldOptions_JSType_descriptor();
|
| +inline const ::std::string& FieldOptions_JSType_Name(FieldOptions_JSType value) {
|
| + return ::google::protobuf::internal::NameOfEnum(
|
| + FieldOptions_JSType_descriptor(), value);
|
| +}
|
| +inline bool FieldOptions_JSType_Parse(
|
| + const ::std::string& name, FieldOptions_JSType* value) {
|
| + return ::google::protobuf::internal::ParseNamedEnum<FieldOptions_JSType>(
|
| + FieldOptions_JSType_descriptor(), name, value);
|
| +}
|
| // ===================================================================
|
|
|
| class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message {
|
| @@ -166,11 +191,11 @@ class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -180,7 +205,9 @@ class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - FileDescriptorSet* New() const;
|
| + inline FileDescriptorSet* New() const { return New(NULL); }
|
| +
|
| + FileDescriptorSet* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const FileDescriptorSet& from);
|
| @@ -199,6 +226,14 @@ class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(FileDescriptorSet* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -208,27 +243,24 @@ class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message
|
| // accessors -------------------------------------------------------
|
|
|
| // repeated .google.protobuf.FileDescriptorProto file = 1;
|
| - inline int file_size() const;
|
| - inline void clear_file();
|
| + int file_size() const;
|
| + void clear_file();
|
| static const int kFileFieldNumber = 1;
|
| - inline const ::google::protobuf::FileDescriptorProto& file(int index) const;
|
| - inline ::google::protobuf::FileDescriptorProto* mutable_file(int index);
|
| - inline ::google::protobuf::FileDescriptorProto* add_file();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >&
|
| - file() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >*
|
| + const ::google::protobuf::FileDescriptorProto& file(int index) const;
|
| + ::google::protobuf::FileDescriptorProto* mutable_file(int index);
|
| + ::google::protobuf::FileDescriptorProto* add_file();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >*
|
| mutable_file();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >&
|
| + file() const;
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.FileDescriptorSet)
|
| private:
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto > file_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
|
| -
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto > file_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -251,11 +283,11 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -265,7 +297,9 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - FileDescriptorProto* New() const;
|
| + inline FileDescriptorProto* New() const { return New(NULL); }
|
| +
|
| + FileDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const FileDescriptorProto& from);
|
| @@ -284,6 +318,14 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(FileDescriptorProto* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -293,134 +335,146 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
|
| // accessors -------------------------------------------------------
|
|
|
| // optional string name = 1;
|
| - inline bool has_name() const;
|
| - inline void clear_name();
|
| + bool has_name() const;
|
| + void clear_name();
|
| static const int kNameFieldNumber = 1;
|
| - inline const ::std::string& name() const;
|
| - inline void set_name(const ::std::string& value);
|
| - inline void set_name(const char* value);
|
| - inline void set_name(const char* value, size_t size);
|
| - inline ::std::string* mutable_name();
|
| - inline ::std::string* release_name();
|
| - inline void set_allocated_name(::std::string* name);
|
| + const ::std::string& name() const;
|
| + void set_name(const ::std::string& value);
|
| + void set_name(const char* value);
|
| + void set_name(const char* value, size_t size);
|
| + ::std::string* mutable_name();
|
| + ::std::string* release_name();
|
| + void set_allocated_name(::std::string* name);
|
|
|
| // optional string package = 2;
|
| - inline bool has_package() const;
|
| - inline void clear_package();
|
| + bool has_package() const;
|
| + void clear_package();
|
| static const int kPackageFieldNumber = 2;
|
| - inline const ::std::string& package() const;
|
| - inline void set_package(const ::std::string& value);
|
| - inline void set_package(const char* value);
|
| - inline void set_package(const char* value, size_t size);
|
| - inline ::std::string* mutable_package();
|
| - inline ::std::string* release_package();
|
| - inline void set_allocated_package(::std::string* package);
|
| + const ::std::string& package() const;
|
| + void set_package(const ::std::string& value);
|
| + void set_package(const char* value);
|
| + void set_package(const char* value, size_t size);
|
| + ::std::string* mutable_package();
|
| + ::std::string* release_package();
|
| + void set_allocated_package(::std::string* package);
|
|
|
| // repeated string dependency = 3;
|
| - inline int dependency_size() const;
|
| - inline void clear_dependency();
|
| + int dependency_size() const;
|
| + void clear_dependency();
|
| static const int kDependencyFieldNumber = 3;
|
| - inline const ::std::string& dependency(int index) const;
|
| - inline ::std::string* mutable_dependency(int index);
|
| - inline void set_dependency(int index, const ::std::string& value);
|
| - inline void set_dependency(int index, const char* value);
|
| - inline void set_dependency(int index, const char* value, size_t size);
|
| - inline ::std::string* add_dependency();
|
| - inline void add_dependency(const ::std::string& value);
|
| - inline void add_dependency(const char* value);
|
| - inline void add_dependency(const char* value, size_t size);
|
| - inline const ::google::protobuf::RepeatedPtrField< ::std::string>& dependency() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_dependency();
|
| + const ::std::string& dependency(int index) const;
|
| + ::std::string* mutable_dependency(int index);
|
| + void set_dependency(int index, const ::std::string& value);
|
| + void set_dependency(int index, const char* value);
|
| + void set_dependency(int index, const char* value, size_t size);
|
| + ::std::string* add_dependency();
|
| + void add_dependency(const ::std::string& value);
|
| + void add_dependency(const char* value);
|
| + void add_dependency(const char* value, size_t size);
|
| + const ::google::protobuf::RepeatedPtrField< ::std::string>& dependency() const;
|
| + ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_dependency();
|
|
|
| // repeated int32 public_dependency = 10;
|
| - inline int public_dependency_size() const;
|
| - inline void clear_public_dependency();
|
| + int public_dependency_size() const;
|
| + void clear_public_dependency();
|
| static const int kPublicDependencyFieldNumber = 10;
|
| - inline ::google::protobuf::int32 public_dependency(int index) const;
|
| - inline void set_public_dependency(int index, ::google::protobuf::int32 value);
|
| - inline void add_public_dependency(::google::protobuf::int32 value);
|
| - inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| + ::google::protobuf::int32 public_dependency(int index) const;
|
| + void set_public_dependency(int index, ::google::protobuf::int32 value);
|
| + void add_public_dependency(::google::protobuf::int32 value);
|
| + const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| public_dependency() const;
|
| - inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| + ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| mutable_public_dependency();
|
|
|
| // repeated int32 weak_dependency = 11;
|
| - inline int weak_dependency_size() const;
|
| - inline void clear_weak_dependency();
|
| + int weak_dependency_size() const;
|
| + void clear_weak_dependency();
|
| static const int kWeakDependencyFieldNumber = 11;
|
| - inline ::google::protobuf::int32 weak_dependency(int index) const;
|
| - inline void set_weak_dependency(int index, ::google::protobuf::int32 value);
|
| - inline void add_weak_dependency(::google::protobuf::int32 value);
|
| - inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| + ::google::protobuf::int32 weak_dependency(int index) const;
|
| + void set_weak_dependency(int index, ::google::protobuf::int32 value);
|
| + void add_weak_dependency(::google::protobuf::int32 value);
|
| + const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| weak_dependency() const;
|
| - inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| + ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| mutable_weak_dependency();
|
|
|
| // repeated .google.protobuf.DescriptorProto message_type = 4;
|
| - inline int message_type_size() const;
|
| - inline void clear_message_type();
|
| + int message_type_size() const;
|
| + void clear_message_type();
|
| static const int kMessageTypeFieldNumber = 4;
|
| - inline const ::google::protobuf::DescriptorProto& message_type(int index) const;
|
| - inline ::google::protobuf::DescriptorProto* mutable_message_type(int index);
|
| - inline ::google::protobuf::DescriptorProto* add_message_type();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >&
|
| - message_type() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >*
|
| + const ::google::protobuf::DescriptorProto& message_type(int index) const;
|
| + ::google::protobuf::DescriptorProto* mutable_message_type(int index);
|
| + ::google::protobuf::DescriptorProto* add_message_type();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >*
|
| mutable_message_type();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >&
|
| + message_type() const;
|
|
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
|
| - inline int enum_type_size() const;
|
| - inline void clear_enum_type();
|
| + int enum_type_size() const;
|
| + void clear_enum_type();
|
| static const int kEnumTypeFieldNumber = 5;
|
| - inline const ::google::protobuf::EnumDescriptorProto& enum_type(int index) const;
|
| - inline ::google::protobuf::EnumDescriptorProto* mutable_enum_type(int index);
|
| - inline ::google::protobuf::EnumDescriptorProto* add_enum_type();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >&
|
| - enum_type() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >*
|
| + const ::google::protobuf::EnumDescriptorProto& enum_type(int index) const;
|
| + ::google::protobuf::EnumDescriptorProto* mutable_enum_type(int index);
|
| + ::google::protobuf::EnumDescriptorProto* add_enum_type();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >*
|
| mutable_enum_type();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >&
|
| + enum_type() const;
|
|
|
| // repeated .google.protobuf.ServiceDescriptorProto service = 6;
|
| - inline int service_size() const;
|
| - inline void clear_service();
|
| + int service_size() const;
|
| + void clear_service();
|
| static const int kServiceFieldNumber = 6;
|
| - inline const ::google::protobuf::ServiceDescriptorProto& service(int index) const;
|
| - inline ::google::protobuf::ServiceDescriptorProto* mutable_service(int index);
|
| - inline ::google::protobuf::ServiceDescriptorProto* add_service();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto >&
|
| - service() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto >*
|
| + const ::google::protobuf::ServiceDescriptorProto& service(int index) const;
|
| + ::google::protobuf::ServiceDescriptorProto* mutable_service(int index);
|
| + ::google::protobuf::ServiceDescriptorProto* add_service();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto >*
|
| mutable_service();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto >&
|
| + service() const;
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 7;
|
| - inline int extension_size() const;
|
| - inline void clear_extension();
|
| + int extension_size() const;
|
| + void clear_extension();
|
| static const int kExtensionFieldNumber = 7;
|
| - inline const ::google::protobuf::FieldDescriptorProto& extension(int index) const;
|
| - inline ::google::protobuf::FieldDescriptorProto* mutable_extension(int index);
|
| - inline ::google::protobuf::FieldDescriptorProto* add_extension();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| - extension() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| + const ::google::protobuf::FieldDescriptorProto& extension(int index) const;
|
| + ::google::protobuf::FieldDescriptorProto* mutable_extension(int index);
|
| + ::google::protobuf::FieldDescriptorProto* add_extension();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| mutable_extension();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| + extension() const;
|
|
|
| // optional .google.protobuf.FileOptions options = 8;
|
| - inline bool has_options() const;
|
| - inline void clear_options();
|
| + bool has_options() const;
|
| + void clear_options();
|
| static const int kOptionsFieldNumber = 8;
|
| - inline const ::google::protobuf::FileOptions& options() const;
|
| - inline ::google::protobuf::FileOptions* mutable_options();
|
| - inline ::google::protobuf::FileOptions* release_options();
|
| - inline void set_allocated_options(::google::protobuf::FileOptions* options);
|
| + const ::google::protobuf::FileOptions& options() const;
|
| + ::google::protobuf::FileOptions* mutable_options();
|
| + ::google::protobuf::FileOptions* release_options();
|
| + void set_allocated_options(::google::protobuf::FileOptions* options);
|
|
|
| // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
|
| - inline bool has_source_code_info() const;
|
| - inline void clear_source_code_info();
|
| + bool has_source_code_info() const;
|
| + void clear_source_code_info();
|
| static const int kSourceCodeInfoFieldNumber = 9;
|
| - inline const ::google::protobuf::SourceCodeInfo& source_code_info() const;
|
| - inline ::google::protobuf::SourceCodeInfo* mutable_source_code_info();
|
| - inline ::google::protobuf::SourceCodeInfo* release_source_code_info();
|
| - inline void set_allocated_source_code_info(::google::protobuf::SourceCodeInfo* source_code_info);
|
| + const ::google::protobuf::SourceCodeInfo& source_code_info() const;
|
| + ::google::protobuf::SourceCodeInfo* mutable_source_code_info();
|
| + ::google::protobuf::SourceCodeInfo* release_source_code_info();
|
| + void set_allocated_source_code_info(::google::protobuf::SourceCodeInfo* source_code_info);
|
| +
|
| + // optional string syntax = 12;
|
| + bool has_syntax() const;
|
| + void clear_syntax();
|
| + static const int kSyntaxFieldNumber = 12;
|
| + const ::std::string& syntax() const;
|
| + void set_syntax(const ::std::string& value);
|
| + void set_syntax(const char* value);
|
| + void set_syntax(const char* value, size_t size);
|
| + ::std::string* mutable_syntax();
|
| + ::std::string* release_syntax();
|
| + void set_allocated_syntax(::std::string* syntax);
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.FileDescriptorProto)
|
| private:
|
| @@ -432,11 +486,14 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
|
| inline void clear_has_options();
|
| inline void set_has_source_code_info();
|
| inline void clear_has_source_code_info();
|
| + inline void set_has_syntax();
|
| + inline void clear_has_syntax();
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::std::string* name_;
|
| - ::std::string* package_;
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| + ::google::protobuf::internal::ArenaStringPtr name_;
|
| + ::google::protobuf::internal::ArenaStringPtr package_;
|
| ::google::protobuf::RepeatedPtrField< ::std::string> dependency_;
|
| ::google::protobuf::RepeatedField< ::google::protobuf::int32 > public_dependency_;
|
| ::google::protobuf::RepeatedField< ::google::protobuf::int32 > weak_dependency_;
|
| @@ -446,10 +503,7 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto > extension_;
|
| ::google::protobuf::FileOptions* options_;
|
| ::google::protobuf::SourceCodeInfo* source_code_info_;
|
| -
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(11 + 31) / 32];
|
| -
|
| + ::google::protobuf::internal::ArenaStringPtr syntax_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -472,11 +526,11 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -486,7 +540,9 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - DescriptorProto_ExtensionRange* New() const;
|
| + inline DescriptorProto_ExtensionRange* New() const { return New(NULL); }
|
| +
|
| + DescriptorProto_ExtensionRange* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const DescriptorProto_ExtensionRange& from);
|
| @@ -505,6 +561,14 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(DescriptorProto_ExtensionRange* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -514,18 +578,18 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto
|
| // accessors -------------------------------------------------------
|
|
|
| // optional int32 start = 1;
|
| - inline bool has_start() const;
|
| - inline void clear_start();
|
| + bool has_start() const;
|
| + void clear_start();
|
| static const int kStartFieldNumber = 1;
|
| - inline ::google::protobuf::int32 start() const;
|
| - inline void set_start(::google::protobuf::int32 value);
|
| + ::google::protobuf::int32 start() const;
|
| + void set_start(::google::protobuf::int32 value);
|
|
|
| // optional int32 end = 2;
|
| - inline bool has_end() const;
|
| - inline void clear_end();
|
| + bool has_end() const;
|
| + void clear_end();
|
| static const int kEndFieldNumber = 2;
|
| - inline ::google::protobuf::int32 end() const;
|
| - inline void set_end(::google::protobuf::int32 value);
|
| + ::google::protobuf::int32 end() const;
|
| + void set_end(::google::protobuf::int32 value);
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.DescriptorProto.ExtensionRange)
|
| private:
|
| @@ -534,20 +598,116 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto
|
| inline void set_has_end();
|
| inline void clear_has_end();
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| ::google::protobuf::int32 start_;
|
| ::google::protobuf::int32 end_;
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
|
| + void InitAsDefaultInstance();
|
| + static DescriptorProto_ExtensionRange* default_instance_;
|
| +};
|
| +// -------------------------------------------------------------------
|
| +
|
| +class LIBPROTOBUF_EXPORT DescriptorProto_ReservedRange : public ::google::protobuf::Message {
|
| + public:
|
| + DescriptorProto_ReservedRange();
|
| + virtual ~DescriptorProto_ReservedRange();
|
| +
|
| + DescriptorProto_ReservedRange(const DescriptorProto_ReservedRange& from);
|
| +
|
| + inline DescriptorProto_ReservedRange& operator=(const DescriptorProto_ReservedRange& from) {
|
| + CopyFrom(from);
|
| + return *this;
|
| + }
|
| +
|
| + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| + return _internal_metadata_.unknown_fields();
|
| + }
|
| +
|
| + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| + }
|
| +
|
| + static const ::google::protobuf::Descriptor* descriptor();
|
| + static const DescriptorProto_ReservedRange& default_instance();
|
| +
|
| + void Swap(DescriptorProto_ReservedRange* other);
|
| +
|
| + // implements Message ----------------------------------------------
|
| +
|
| + inline DescriptorProto_ReservedRange* New() const { return New(NULL); }
|
| +
|
| + DescriptorProto_ReservedRange* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| + void CopyFrom(const DescriptorProto_ReservedRange& from);
|
| + void MergeFrom(const DescriptorProto_ReservedRange& from);
|
| + void Clear();
|
| + bool IsInitialized() const;
|
| +
|
| + int ByteSize() const;
|
| + bool MergePartialFromCodedStream(
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| + void SerializeWithCachedSizes(
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| + private:
|
| + void SharedCtor();
|
| + void SharedDtor();
|
| + void SetCachedSize(int size) const;
|
| + void InternalSwap(DescriptorProto_ReservedRange* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| + public:
|
| +
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
| +
|
| + // nested types ----------------------------------------------------
|
| +
|
| + // accessors -------------------------------------------------------
|
| +
|
| + // optional int32 start = 1;
|
| + bool has_start() const;
|
| + void clear_start();
|
| + static const int kStartFieldNumber = 1;
|
| + ::google::protobuf::int32 start() const;
|
| + void set_start(::google::protobuf::int32 value);
|
| +
|
| + // optional int32 end = 2;
|
| + bool has_end() const;
|
| + void clear_end();
|
| + static const int kEndFieldNumber = 2;
|
| + ::google::protobuf::int32 end() const;
|
| + void set_end(::google::protobuf::int32 value);
|
| +
|
| + // @@protoc_insertion_point(class_scope:google.protobuf.DescriptorProto.ReservedRange)
|
| + private:
|
| + inline void set_has_start();
|
| + inline void clear_has_start();
|
| + inline void set_has_end();
|
| + inline void clear_has_end();
|
|
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| + ::google::protobuf::int32 start_;
|
| + ::google::protobuf::int32 end_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| void InitAsDefaultInstance();
|
| - static DescriptorProto_ExtensionRange* default_instance_;
|
| + static DescriptorProto_ReservedRange* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| @@ -564,11 +724,11 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -578,7 +738,9 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - DescriptorProto* New() const;
|
| + inline DescriptorProto* New() const { return New(NULL); }
|
| +
|
| + DescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const DescriptorProto& from);
|
| @@ -597,6 +759,14 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(DescriptorProto* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -604,89 +774,130 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {
|
| // nested types ----------------------------------------------------
|
|
|
| typedef DescriptorProto_ExtensionRange ExtensionRange;
|
| + typedef DescriptorProto_ReservedRange ReservedRange;
|
|
|
| // accessors -------------------------------------------------------
|
|
|
| // optional string name = 1;
|
| - inline bool has_name() const;
|
| - inline void clear_name();
|
| + bool has_name() const;
|
| + void clear_name();
|
| static const int kNameFieldNumber = 1;
|
| - inline const ::std::string& name() const;
|
| - inline void set_name(const ::std::string& value);
|
| - inline void set_name(const char* value);
|
| - inline void set_name(const char* value, size_t size);
|
| - inline ::std::string* mutable_name();
|
| - inline ::std::string* release_name();
|
| - inline void set_allocated_name(::std::string* name);
|
| + const ::std::string& name() const;
|
| + void set_name(const ::std::string& value);
|
| + void set_name(const char* value);
|
| + void set_name(const char* value, size_t size);
|
| + ::std::string* mutable_name();
|
| + ::std::string* release_name();
|
| + void set_allocated_name(::std::string* name);
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto field = 2;
|
| - inline int field_size() const;
|
| - inline void clear_field();
|
| + int field_size() const;
|
| + void clear_field();
|
| static const int kFieldFieldNumber = 2;
|
| - inline const ::google::protobuf::FieldDescriptorProto& field(int index) const;
|
| - inline ::google::protobuf::FieldDescriptorProto* mutable_field(int index);
|
| - inline ::google::protobuf::FieldDescriptorProto* add_field();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| - field() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| + const ::google::protobuf::FieldDescriptorProto& field(int index) const;
|
| + ::google::protobuf::FieldDescriptorProto* mutable_field(int index);
|
| + ::google::protobuf::FieldDescriptorProto* add_field();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| mutable_field();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| + field() const;
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 6;
|
| - inline int extension_size() const;
|
| - inline void clear_extension();
|
| + int extension_size() const;
|
| + void clear_extension();
|
| static const int kExtensionFieldNumber = 6;
|
| - inline const ::google::protobuf::FieldDescriptorProto& extension(int index) const;
|
| - inline ::google::protobuf::FieldDescriptorProto* mutable_extension(int index);
|
| - inline ::google::protobuf::FieldDescriptorProto* add_extension();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| - extension() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| + const ::google::protobuf::FieldDescriptorProto& extension(int index) const;
|
| + ::google::protobuf::FieldDescriptorProto* mutable_extension(int index);
|
| + ::google::protobuf::FieldDescriptorProto* add_extension();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| mutable_extension();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| + extension() const;
|
|
|
| // repeated .google.protobuf.DescriptorProto nested_type = 3;
|
| - inline int nested_type_size() const;
|
| - inline void clear_nested_type();
|
| + int nested_type_size() const;
|
| + void clear_nested_type();
|
| static const int kNestedTypeFieldNumber = 3;
|
| - inline const ::google::protobuf::DescriptorProto& nested_type(int index) const;
|
| - inline ::google::protobuf::DescriptorProto* mutable_nested_type(int index);
|
| - inline ::google::protobuf::DescriptorProto* add_nested_type();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >&
|
| - nested_type() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >*
|
| + const ::google::protobuf::DescriptorProto& nested_type(int index) const;
|
| + ::google::protobuf::DescriptorProto* mutable_nested_type(int index);
|
| + ::google::protobuf::DescriptorProto* add_nested_type();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >*
|
| mutable_nested_type();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >&
|
| + nested_type() const;
|
|
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
|
| - inline int enum_type_size() const;
|
| - inline void clear_enum_type();
|
| + int enum_type_size() const;
|
| + void clear_enum_type();
|
| static const int kEnumTypeFieldNumber = 4;
|
| - inline const ::google::protobuf::EnumDescriptorProto& enum_type(int index) const;
|
| - inline ::google::protobuf::EnumDescriptorProto* mutable_enum_type(int index);
|
| - inline ::google::protobuf::EnumDescriptorProto* add_enum_type();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >&
|
| - enum_type() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >*
|
| + const ::google::protobuf::EnumDescriptorProto& enum_type(int index) const;
|
| + ::google::protobuf::EnumDescriptorProto* mutable_enum_type(int index);
|
| + ::google::protobuf::EnumDescriptorProto* add_enum_type();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >*
|
| mutable_enum_type();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >&
|
| + enum_type() const;
|
|
|
| // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
|
| - inline int extension_range_size() const;
|
| - inline void clear_extension_range();
|
| + int extension_range_size() const;
|
| + void clear_extension_range();
|
| static const int kExtensionRangeFieldNumber = 5;
|
| - inline const ::google::protobuf::DescriptorProto_ExtensionRange& extension_range(int index) const;
|
| - inline ::google::protobuf::DescriptorProto_ExtensionRange* mutable_extension_range(int index);
|
| - inline ::google::protobuf::DescriptorProto_ExtensionRange* add_extension_range();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange >&
|
| - extension_range() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange >*
|
| + const ::google::protobuf::DescriptorProto_ExtensionRange& extension_range(int index) const;
|
| + ::google::protobuf::DescriptorProto_ExtensionRange* mutable_extension_range(int index);
|
| + ::google::protobuf::DescriptorProto_ExtensionRange* add_extension_range();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange >*
|
| mutable_extension_range();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange >&
|
| + extension_range() const;
|
| +
|
| + // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
|
| + int oneof_decl_size() const;
|
| + void clear_oneof_decl();
|
| + static const int kOneofDeclFieldNumber = 8;
|
| + const ::google::protobuf::OneofDescriptorProto& oneof_decl(int index) const;
|
| + ::google::protobuf::OneofDescriptorProto* mutable_oneof_decl(int index);
|
| + ::google::protobuf::OneofDescriptorProto* add_oneof_decl();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::OneofDescriptorProto >*
|
| + mutable_oneof_decl();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::OneofDescriptorProto >&
|
| + oneof_decl() const;
|
|
|
| // optional .google.protobuf.MessageOptions options = 7;
|
| - inline bool has_options() const;
|
| - inline void clear_options();
|
| + bool has_options() const;
|
| + void clear_options();
|
| static const int kOptionsFieldNumber = 7;
|
| - inline const ::google::protobuf::MessageOptions& options() const;
|
| - inline ::google::protobuf::MessageOptions* mutable_options();
|
| - inline ::google::protobuf::MessageOptions* release_options();
|
| - inline void set_allocated_options(::google::protobuf::MessageOptions* options);
|
| + const ::google::protobuf::MessageOptions& options() const;
|
| + ::google::protobuf::MessageOptions* mutable_options();
|
| + ::google::protobuf::MessageOptions* release_options();
|
| + void set_allocated_options(::google::protobuf::MessageOptions* options);
|
| +
|
| + // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
|
| + int reserved_range_size() const;
|
| + void clear_reserved_range();
|
| + static const int kReservedRangeFieldNumber = 9;
|
| + const ::google::protobuf::DescriptorProto_ReservedRange& reserved_range(int index) const;
|
| + ::google::protobuf::DescriptorProto_ReservedRange* mutable_reserved_range(int index);
|
| + ::google::protobuf::DescriptorProto_ReservedRange* add_reserved_range();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ReservedRange >*
|
| + mutable_reserved_range();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ReservedRange >&
|
| + reserved_range() const;
|
| +
|
| + // repeated string reserved_name = 10;
|
| + int reserved_name_size() const;
|
| + void clear_reserved_name();
|
| + static const int kReservedNameFieldNumber = 10;
|
| + const ::std::string& reserved_name(int index) const;
|
| + ::std::string* mutable_reserved_name(int index);
|
| + void set_reserved_name(int index, const ::std::string& value);
|
| + void set_reserved_name(int index, const char* value);
|
| + void set_reserved_name(int index, const char* value, size_t size);
|
| + ::std::string* add_reserved_name();
|
| + void add_reserved_name(const ::std::string& value);
|
| + void add_reserved_name(const char* value);
|
| + void add_reserved_name(const char* value, size_t size);
|
| + const ::google::protobuf::RepeatedPtrField< ::std::string>& reserved_name() const;
|
| + ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_reserved_name();
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.DescriptorProto)
|
| private:
|
| @@ -695,19 +906,19 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {
|
| inline void set_has_options();
|
| inline void clear_has_options();
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::std::string* name_;
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| + ::google::protobuf::internal::ArenaStringPtr name_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto > field_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto > extension_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto > nested_type_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto > enum_type_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange > extension_range_;
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::OneofDescriptorProto > oneof_decl_;
|
| ::google::protobuf::MessageOptions* options_;
|
| -
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
|
| -
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ReservedRange > reserved_range_;
|
| + ::google::protobuf::RepeatedPtrField< ::std::string> reserved_name_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -730,11 +941,11 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -744,7 +955,9 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - FieldDescriptorProto* New() const;
|
| + inline FieldDescriptorProto* New() const { return New(NULL); }
|
| +
|
| + FieldDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const FieldDescriptorProto& from);
|
| @@ -763,6 +976,14 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(FieldDescriptorProto* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -837,82 +1058,101 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa
|
| // accessors -------------------------------------------------------
|
|
|
| // optional string name = 1;
|
| - inline bool has_name() const;
|
| - inline void clear_name();
|
| + bool has_name() const;
|
| + void clear_name();
|
| static const int kNameFieldNumber = 1;
|
| - inline const ::std::string& name() const;
|
| - inline void set_name(const ::std::string& value);
|
| - inline void set_name(const char* value);
|
| - inline void set_name(const char* value, size_t size);
|
| - inline ::std::string* mutable_name();
|
| - inline ::std::string* release_name();
|
| - inline void set_allocated_name(::std::string* name);
|
| + const ::std::string& name() const;
|
| + void set_name(const ::std::string& value);
|
| + void set_name(const char* value);
|
| + void set_name(const char* value, size_t size);
|
| + ::std::string* mutable_name();
|
| + ::std::string* release_name();
|
| + void set_allocated_name(::std::string* name);
|
|
|
| // optional int32 number = 3;
|
| - inline bool has_number() const;
|
| - inline void clear_number();
|
| + bool has_number() const;
|
| + void clear_number();
|
| static const int kNumberFieldNumber = 3;
|
| - inline ::google::protobuf::int32 number() const;
|
| - inline void set_number(::google::protobuf::int32 value);
|
| + ::google::protobuf::int32 number() const;
|
| + void set_number(::google::protobuf::int32 value);
|
|
|
| // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
|
| - inline bool has_label() const;
|
| - inline void clear_label();
|
| + bool has_label() const;
|
| + void clear_label();
|
| static const int kLabelFieldNumber = 4;
|
| - inline ::google::protobuf::FieldDescriptorProto_Label label() const;
|
| - inline void set_label(::google::protobuf::FieldDescriptorProto_Label value);
|
| + ::google::protobuf::FieldDescriptorProto_Label label() const;
|
| + void set_label(::google::protobuf::FieldDescriptorProto_Label value);
|
|
|
| // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
|
| - inline bool has_type() const;
|
| - inline void clear_type();
|
| + bool has_type() const;
|
| + void clear_type();
|
| static const int kTypeFieldNumber = 5;
|
| - inline ::google::protobuf::FieldDescriptorProto_Type type() const;
|
| - inline void set_type(::google::protobuf::FieldDescriptorProto_Type value);
|
| + ::google::protobuf::FieldDescriptorProto_Type type() const;
|
| + void set_type(::google::protobuf::FieldDescriptorProto_Type value);
|
|
|
| // optional string type_name = 6;
|
| - inline bool has_type_name() const;
|
| - inline void clear_type_name();
|
| + bool has_type_name() const;
|
| + void clear_type_name();
|
| static const int kTypeNameFieldNumber = 6;
|
| - inline const ::std::string& type_name() const;
|
| - inline void set_type_name(const ::std::string& value);
|
| - inline void set_type_name(const char* value);
|
| - inline void set_type_name(const char* value, size_t size);
|
| - inline ::std::string* mutable_type_name();
|
| - inline ::std::string* release_type_name();
|
| - inline void set_allocated_type_name(::std::string* type_name);
|
| + const ::std::string& type_name() const;
|
| + void set_type_name(const ::std::string& value);
|
| + void set_type_name(const char* value);
|
| + void set_type_name(const char* value, size_t size);
|
| + ::std::string* mutable_type_name();
|
| + ::std::string* release_type_name();
|
| + void set_allocated_type_name(::std::string* type_name);
|
|
|
| // optional string extendee = 2;
|
| - inline bool has_extendee() const;
|
| - inline void clear_extendee();
|
| + bool has_extendee() const;
|
| + void clear_extendee();
|
| static const int kExtendeeFieldNumber = 2;
|
| - inline const ::std::string& extendee() const;
|
| - inline void set_extendee(const ::std::string& value);
|
| - inline void set_extendee(const char* value);
|
| - inline void set_extendee(const char* value, size_t size);
|
| - inline ::std::string* mutable_extendee();
|
| - inline ::std::string* release_extendee();
|
| - inline void set_allocated_extendee(::std::string* extendee);
|
| + const ::std::string& extendee() const;
|
| + void set_extendee(const ::std::string& value);
|
| + void set_extendee(const char* value);
|
| + void set_extendee(const char* value, size_t size);
|
| + ::std::string* mutable_extendee();
|
| + ::std::string* release_extendee();
|
| + void set_allocated_extendee(::std::string* extendee);
|
|
|
| // optional string default_value = 7;
|
| - inline bool has_default_value() const;
|
| - inline void clear_default_value();
|
| + bool has_default_value() const;
|
| + void clear_default_value();
|
| static const int kDefaultValueFieldNumber = 7;
|
| - inline const ::std::string& default_value() const;
|
| - inline void set_default_value(const ::std::string& value);
|
| - inline void set_default_value(const char* value);
|
| - inline void set_default_value(const char* value, size_t size);
|
| - inline ::std::string* mutable_default_value();
|
| - inline ::std::string* release_default_value();
|
| - inline void set_allocated_default_value(::std::string* default_value);
|
| + const ::std::string& default_value() const;
|
| + void set_default_value(const ::std::string& value);
|
| + void set_default_value(const char* value);
|
| + void set_default_value(const char* value, size_t size);
|
| + ::std::string* mutable_default_value();
|
| + ::std::string* release_default_value();
|
| + void set_allocated_default_value(::std::string* default_value);
|
| +
|
| + // optional int32 oneof_index = 9;
|
| + bool has_oneof_index() const;
|
| + void clear_oneof_index();
|
| + static const int kOneofIndexFieldNumber = 9;
|
| + ::google::protobuf::int32 oneof_index() const;
|
| + void set_oneof_index(::google::protobuf::int32 value);
|
| +
|
| + // optional string json_name = 10;
|
| + bool has_json_name() const;
|
| + void clear_json_name();
|
| + static const int kJsonNameFieldNumber = 10;
|
| + const ::std::string& json_name() const;
|
| + void set_json_name(const ::std::string& value);
|
| + void set_json_name(const char* value);
|
| + void set_json_name(const char* value, size_t size);
|
| + ::std::string* mutable_json_name();
|
| + ::std::string* release_json_name();
|
| + void set_allocated_json_name(::std::string* json_name);
|
|
|
| // optional .google.protobuf.FieldOptions options = 8;
|
| - inline bool has_options() const;
|
| - inline void clear_options();
|
| + bool has_options() const;
|
| + void clear_options();
|
| static const int kOptionsFieldNumber = 8;
|
| - inline const ::google::protobuf::FieldOptions& options() const;
|
| - inline ::google::protobuf::FieldOptions* mutable_options();
|
| - inline ::google::protobuf::FieldOptions* release_options();
|
| - inline void set_allocated_options(::google::protobuf::FieldOptions* options);
|
| + const ::google::protobuf::FieldOptions& options() const;
|
| + ::google::protobuf::FieldOptions* mutable_options();
|
| + ::google::protobuf::FieldOptions* release_options();
|
| + void set_allocated_options(::google::protobuf::FieldOptions* options);
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.FieldDescriptorProto)
|
| private:
|
| @@ -930,29 +1170,126 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa
|
| inline void clear_has_extendee();
|
| inline void set_has_default_value();
|
| inline void clear_has_default_value();
|
| + inline void set_has_oneof_index();
|
| + inline void clear_has_oneof_index();
|
| + inline void set_has_json_name();
|
| + inline void clear_has_json_name();
|
| inline void set_has_options();
|
| inline void clear_has_options();
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::std::string* name_;
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| + ::google::protobuf::internal::ArenaStringPtr name_;
|
| ::google::protobuf::int32 number_;
|
| int label_;
|
| - ::std::string* type_name_;
|
| - ::std::string* extendee_;
|
| - ::std::string* default_value_;
|
| - ::google::protobuf::FieldOptions* options_;
|
| + ::google::protobuf::internal::ArenaStringPtr type_name_;
|
| + ::google::protobuf::internal::ArenaStringPtr extendee_;
|
| int type_;
|
| + ::google::protobuf::int32 oneof_index_;
|
| + ::google::protobuf::internal::ArenaStringPtr default_value_;
|
| + ::google::protobuf::internal::ArenaStringPtr json_name_;
|
| + ::google::protobuf::FieldOptions* options_;
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(8 + 31) / 32];
|
| + void InitAsDefaultInstance();
|
| + static FieldDescriptorProto* default_instance_;
|
| +};
|
| +// -------------------------------------------------------------------
|
| +
|
| +class LIBPROTOBUF_EXPORT OneofDescriptorProto : public ::google::protobuf::Message {
|
| + public:
|
| + OneofDescriptorProto();
|
| + virtual ~OneofDescriptorProto();
|
| +
|
| + OneofDescriptorProto(const OneofDescriptorProto& from);
|
| +
|
| + inline OneofDescriptorProto& operator=(const OneofDescriptorProto& from) {
|
| + CopyFrom(from);
|
| + return *this;
|
| + }
|
| +
|
| + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| + return _internal_metadata_.unknown_fields();
|
| + }
|
| +
|
| + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| + }
|
| +
|
| + static const ::google::protobuf::Descriptor* descriptor();
|
| + static const OneofDescriptorProto& default_instance();
|
| +
|
| + void Swap(OneofDescriptorProto* other);
|
| +
|
| + // implements Message ----------------------------------------------
|
| +
|
| + inline OneofDescriptorProto* New() const { return New(NULL); }
|
| +
|
| + OneofDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| + void CopyFrom(const OneofDescriptorProto& from);
|
| + void MergeFrom(const OneofDescriptorProto& from);
|
| + void Clear();
|
| + bool IsInitialized() const;
|
| +
|
| + int ByteSize() const;
|
| + bool MergePartialFromCodedStream(
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| + void SerializeWithCachedSizes(
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| + private:
|
| + void SharedCtor();
|
| + void SharedDtor();
|
| + void SetCachedSize(int size) const;
|
| + void InternalSwap(OneofDescriptorProto* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| + public:
|
| +
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
| +
|
| + // nested types ----------------------------------------------------
|
| +
|
| + // accessors -------------------------------------------------------
|
| +
|
| + // optional string name = 1;
|
| + bool has_name() const;
|
| + void clear_name();
|
| + static const int kNameFieldNumber = 1;
|
| + const ::std::string& name() const;
|
| + void set_name(const ::std::string& value);
|
| + void set_name(const char* value);
|
| + void set_name(const char* value, size_t size);
|
| + ::std::string* mutable_name();
|
| + ::std::string* release_name();
|
| + void set_allocated_name(::std::string* name);
|
| +
|
| + // @@protoc_insertion_point(class_scope:google.protobuf.OneofDescriptorProto)
|
| + private:
|
| + inline void set_has_name();
|
| + inline void clear_has_name();
|
|
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| + ::google::protobuf::internal::ArenaStringPtr name_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| void InitAsDefaultInstance();
|
| - static FieldDescriptorProto* default_instance_;
|
| + static OneofDescriptorProto* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| @@ -969,11 +1306,11 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -983,7 +1320,9 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - EnumDescriptorProto* New() const;
|
| + inline EnumDescriptorProto* New() const { return New(NULL); }
|
| +
|
| + EnumDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const EnumDescriptorProto& from);
|
| @@ -1002,6 +1341,14 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(EnumDescriptorProto* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -1011,37 +1358,37 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag
|
| // accessors -------------------------------------------------------
|
|
|
| // optional string name = 1;
|
| - inline bool has_name() const;
|
| - inline void clear_name();
|
| + bool has_name() const;
|
| + void clear_name();
|
| static const int kNameFieldNumber = 1;
|
| - inline const ::std::string& name() const;
|
| - inline void set_name(const ::std::string& value);
|
| - inline void set_name(const char* value);
|
| - inline void set_name(const char* value, size_t size);
|
| - inline ::std::string* mutable_name();
|
| - inline ::std::string* release_name();
|
| - inline void set_allocated_name(::std::string* name);
|
| + const ::std::string& name() const;
|
| + void set_name(const ::std::string& value);
|
| + void set_name(const char* value);
|
| + void set_name(const char* value, size_t size);
|
| + ::std::string* mutable_name();
|
| + ::std::string* release_name();
|
| + void set_allocated_name(::std::string* name);
|
|
|
| // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
|
| - inline int value_size() const;
|
| - inline void clear_value();
|
| + int value_size() const;
|
| + void clear_value();
|
| static const int kValueFieldNumber = 2;
|
| - inline const ::google::protobuf::EnumValueDescriptorProto& value(int index) const;
|
| - inline ::google::protobuf::EnumValueDescriptorProto* mutable_value(int index);
|
| - inline ::google::protobuf::EnumValueDescriptorProto* add_value();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto >&
|
| - value() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto >*
|
| + const ::google::protobuf::EnumValueDescriptorProto& value(int index) const;
|
| + ::google::protobuf::EnumValueDescriptorProto* mutable_value(int index);
|
| + ::google::protobuf::EnumValueDescriptorProto* add_value();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto >*
|
| mutable_value();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto >&
|
| + value() const;
|
|
|
| // optional .google.protobuf.EnumOptions options = 3;
|
| - inline bool has_options() const;
|
| - inline void clear_options();
|
| + bool has_options() const;
|
| + void clear_options();
|
| static const int kOptionsFieldNumber = 3;
|
| - inline const ::google::protobuf::EnumOptions& options() const;
|
| - inline ::google::protobuf::EnumOptions* mutable_options();
|
| - inline ::google::protobuf::EnumOptions* release_options();
|
| - inline void set_allocated_options(::google::protobuf::EnumOptions* options);
|
| + const ::google::protobuf::EnumOptions& options() const;
|
| + ::google::protobuf::EnumOptions* mutable_options();
|
| + ::google::protobuf::EnumOptions* release_options();
|
| + void set_allocated_options(::google::protobuf::EnumOptions* options);
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.EnumDescriptorProto)
|
| private:
|
| @@ -1050,15 +1397,12 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag
|
| inline void set_has_options();
|
| inline void clear_has_options();
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::std::string* name_;
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| + ::google::protobuf::internal::ArenaStringPtr name_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto > value_;
|
| ::google::protobuf::EnumOptions* options_;
|
| -
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
|
| -
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -1081,11 +1425,11 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -1095,7 +1439,9 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - EnumValueDescriptorProto* New() const;
|
| + inline EnumValueDescriptorProto* New() const { return New(NULL); }
|
| +
|
| + EnumValueDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const EnumValueDescriptorProto& from);
|
| @@ -1114,6 +1460,14 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(EnumValueDescriptorProto* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -1123,32 +1477,32 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M
|
| // accessors -------------------------------------------------------
|
|
|
| // optional string name = 1;
|
| - inline bool has_name() const;
|
| - inline void clear_name();
|
| + bool has_name() const;
|
| + void clear_name();
|
| static const int kNameFieldNumber = 1;
|
| - inline const ::std::string& name() const;
|
| - inline void set_name(const ::std::string& value);
|
| - inline void set_name(const char* value);
|
| - inline void set_name(const char* value, size_t size);
|
| - inline ::std::string* mutable_name();
|
| - inline ::std::string* release_name();
|
| - inline void set_allocated_name(::std::string* name);
|
| + const ::std::string& name() const;
|
| + void set_name(const ::std::string& value);
|
| + void set_name(const char* value);
|
| + void set_name(const char* value, size_t size);
|
| + ::std::string* mutable_name();
|
| + ::std::string* release_name();
|
| + void set_allocated_name(::std::string* name);
|
|
|
| // optional int32 number = 2;
|
| - inline bool has_number() const;
|
| - inline void clear_number();
|
| + bool has_number() const;
|
| + void clear_number();
|
| static const int kNumberFieldNumber = 2;
|
| - inline ::google::protobuf::int32 number() const;
|
| - inline void set_number(::google::protobuf::int32 value);
|
| + ::google::protobuf::int32 number() const;
|
| + void set_number(::google::protobuf::int32 value);
|
|
|
| // optional .google.protobuf.EnumValueOptions options = 3;
|
| - inline bool has_options() const;
|
| - inline void clear_options();
|
| + bool has_options() const;
|
| + void clear_options();
|
| static const int kOptionsFieldNumber = 3;
|
| - inline const ::google::protobuf::EnumValueOptions& options() const;
|
| - inline ::google::protobuf::EnumValueOptions* mutable_options();
|
| - inline ::google::protobuf::EnumValueOptions* release_options();
|
| - inline void set_allocated_options(::google::protobuf::EnumValueOptions* options);
|
| + const ::google::protobuf::EnumValueOptions& options() const;
|
| + ::google::protobuf::EnumValueOptions* mutable_options();
|
| + ::google::protobuf::EnumValueOptions* release_options();
|
| + void set_allocated_options(::google::protobuf::EnumValueOptions* options);
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.EnumValueDescriptorProto)
|
| private:
|
| @@ -1159,15 +1513,12 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M
|
| inline void set_has_options();
|
| inline void clear_has_options();
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::std::string* name_;
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| + ::google::protobuf::internal::ArenaStringPtr name_;
|
| ::google::protobuf::EnumValueOptions* options_;
|
| ::google::protobuf::int32 number_;
|
| -
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
|
| -
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -1190,11 +1541,11 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -1204,7 +1555,9 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - ServiceDescriptorProto* New() const;
|
| + inline ServiceDescriptorProto* New() const { return New(NULL); }
|
| +
|
| + ServiceDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const ServiceDescriptorProto& from);
|
| @@ -1223,6 +1576,14 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(ServiceDescriptorProto* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -1232,37 +1593,37 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes
|
| // accessors -------------------------------------------------------
|
|
|
| // optional string name = 1;
|
| - inline bool has_name() const;
|
| - inline void clear_name();
|
| + bool has_name() const;
|
| + void clear_name();
|
| static const int kNameFieldNumber = 1;
|
| - inline const ::std::string& name() const;
|
| - inline void set_name(const ::std::string& value);
|
| - inline void set_name(const char* value);
|
| - inline void set_name(const char* value, size_t size);
|
| - inline ::std::string* mutable_name();
|
| - inline ::std::string* release_name();
|
| - inline void set_allocated_name(::std::string* name);
|
| + const ::std::string& name() const;
|
| + void set_name(const ::std::string& value);
|
| + void set_name(const char* value);
|
| + void set_name(const char* value, size_t size);
|
| + ::std::string* mutable_name();
|
| + ::std::string* release_name();
|
| + void set_allocated_name(::std::string* name);
|
|
|
| // repeated .google.protobuf.MethodDescriptorProto method = 2;
|
| - inline int method_size() const;
|
| - inline void clear_method();
|
| + int method_size() const;
|
| + void clear_method();
|
| static const int kMethodFieldNumber = 2;
|
| - inline const ::google::protobuf::MethodDescriptorProto& method(int index) const;
|
| - inline ::google::protobuf::MethodDescriptorProto* mutable_method(int index);
|
| - inline ::google::protobuf::MethodDescriptorProto* add_method();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto >&
|
| - method() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto >*
|
| + const ::google::protobuf::MethodDescriptorProto& method(int index) const;
|
| + ::google::protobuf::MethodDescriptorProto* mutable_method(int index);
|
| + ::google::protobuf::MethodDescriptorProto* add_method();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto >*
|
| mutable_method();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto >&
|
| + method() const;
|
|
|
| // optional .google.protobuf.ServiceOptions options = 3;
|
| - inline bool has_options() const;
|
| - inline void clear_options();
|
| + bool has_options() const;
|
| + void clear_options();
|
| static const int kOptionsFieldNumber = 3;
|
| - inline const ::google::protobuf::ServiceOptions& options() const;
|
| - inline ::google::protobuf::ServiceOptions* mutable_options();
|
| - inline ::google::protobuf::ServiceOptions* release_options();
|
| - inline void set_allocated_options(::google::protobuf::ServiceOptions* options);
|
| + const ::google::protobuf::ServiceOptions& options() const;
|
| + ::google::protobuf::ServiceOptions* mutable_options();
|
| + ::google::protobuf::ServiceOptions* release_options();
|
| + void set_allocated_options(::google::protobuf::ServiceOptions* options);
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.ServiceDescriptorProto)
|
| private:
|
| @@ -1271,15 +1632,12 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes
|
| inline void set_has_options();
|
| inline void clear_has_options();
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::std::string* name_;
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| + ::google::protobuf::internal::ArenaStringPtr name_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto > method_;
|
| ::google::protobuf::ServiceOptions* options_;
|
| -
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
|
| -
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -1302,11 +1660,11 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -1316,7 +1674,9 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - MethodDescriptorProto* New() const;
|
| + inline MethodDescriptorProto* New() const { return New(NULL); }
|
| +
|
| + MethodDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const MethodDescriptorProto& from);
|
| @@ -1335,6 +1695,14 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(MethodDescriptorProto* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -1344,49 +1712,63 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
|
| // accessors -------------------------------------------------------
|
|
|
| // optional string name = 1;
|
| - inline bool has_name() const;
|
| - inline void clear_name();
|
| + bool has_name() const;
|
| + void clear_name();
|
| static const int kNameFieldNumber = 1;
|
| - inline const ::std::string& name() const;
|
| - inline void set_name(const ::std::string& value);
|
| - inline void set_name(const char* value);
|
| - inline void set_name(const char* value, size_t size);
|
| - inline ::std::string* mutable_name();
|
| - inline ::std::string* release_name();
|
| - inline void set_allocated_name(::std::string* name);
|
| + const ::std::string& name() const;
|
| + void set_name(const ::std::string& value);
|
| + void set_name(const char* value);
|
| + void set_name(const char* value, size_t size);
|
| + ::std::string* mutable_name();
|
| + ::std::string* release_name();
|
| + void set_allocated_name(::std::string* name);
|
|
|
| // optional string input_type = 2;
|
| - inline bool has_input_type() const;
|
| - inline void clear_input_type();
|
| + bool has_input_type() const;
|
| + void clear_input_type();
|
| static const int kInputTypeFieldNumber = 2;
|
| - inline const ::std::string& input_type() const;
|
| - inline void set_input_type(const ::std::string& value);
|
| - inline void set_input_type(const char* value);
|
| - inline void set_input_type(const char* value, size_t size);
|
| - inline ::std::string* mutable_input_type();
|
| - inline ::std::string* release_input_type();
|
| - inline void set_allocated_input_type(::std::string* input_type);
|
| + const ::std::string& input_type() const;
|
| + void set_input_type(const ::std::string& value);
|
| + void set_input_type(const char* value);
|
| + void set_input_type(const char* value, size_t size);
|
| + ::std::string* mutable_input_type();
|
| + ::std::string* release_input_type();
|
| + void set_allocated_input_type(::std::string* input_type);
|
|
|
| // optional string output_type = 3;
|
| - inline bool has_output_type() const;
|
| - inline void clear_output_type();
|
| + bool has_output_type() const;
|
| + void clear_output_type();
|
| static const int kOutputTypeFieldNumber = 3;
|
| - inline const ::std::string& output_type() const;
|
| - inline void set_output_type(const ::std::string& value);
|
| - inline void set_output_type(const char* value);
|
| - inline void set_output_type(const char* value, size_t size);
|
| - inline ::std::string* mutable_output_type();
|
| - inline ::std::string* release_output_type();
|
| - inline void set_allocated_output_type(::std::string* output_type);
|
| + const ::std::string& output_type() const;
|
| + void set_output_type(const ::std::string& value);
|
| + void set_output_type(const char* value);
|
| + void set_output_type(const char* value, size_t size);
|
| + ::std::string* mutable_output_type();
|
| + ::std::string* release_output_type();
|
| + void set_allocated_output_type(::std::string* output_type);
|
|
|
| // optional .google.protobuf.MethodOptions options = 4;
|
| - inline bool has_options() const;
|
| - inline void clear_options();
|
| + bool has_options() const;
|
| + void clear_options();
|
| static const int kOptionsFieldNumber = 4;
|
| - inline const ::google::protobuf::MethodOptions& options() const;
|
| - inline ::google::protobuf::MethodOptions* mutable_options();
|
| - inline ::google::protobuf::MethodOptions* release_options();
|
| - inline void set_allocated_options(::google::protobuf::MethodOptions* options);
|
| + const ::google::protobuf::MethodOptions& options() const;
|
| + ::google::protobuf::MethodOptions* mutable_options();
|
| + ::google::protobuf::MethodOptions* release_options();
|
| + void set_allocated_options(::google::protobuf::MethodOptions* options);
|
| +
|
| + // optional bool client_streaming = 5 [default = false];
|
| + bool has_client_streaming() const;
|
| + void clear_client_streaming();
|
| + static const int kClientStreamingFieldNumber = 5;
|
| + bool client_streaming() const;
|
| + void set_client_streaming(bool value);
|
| +
|
| + // optional bool server_streaming = 6 [default = false];
|
| + bool has_server_streaming() const;
|
| + void clear_server_streaming();
|
| + static const int kServerStreamingFieldNumber = 6;
|
| + bool server_streaming() const;
|
| + void set_server_streaming(bool value);
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.MethodDescriptorProto)
|
| private:
|
| @@ -1398,17 +1780,20 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
|
| inline void clear_has_output_type();
|
| inline void set_has_options();
|
| inline void clear_has_options();
|
| + inline void set_has_client_streaming();
|
| + inline void clear_has_client_streaming();
|
| + inline void set_has_server_streaming();
|
| + inline void clear_has_server_streaming();
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::std::string* name_;
|
| - ::std::string* input_type_;
|
| - ::std::string* output_type_;
|
| - ::google::protobuf::MethodOptions* options_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
|
| -
|
| + ::google::protobuf::internal::ArenaStringPtr name_;
|
| + ::google::protobuf::internal::ArenaStringPtr input_type_;
|
| + ::google::protobuf::internal::ArenaStringPtr output_type_;
|
| + ::google::protobuf::MethodOptions* options_;
|
| + bool client_streaming_;
|
| + bool server_streaming_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -1431,11 +1816,11 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -1445,7 +1830,9 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - FileOptions* New() const;
|
| + inline FileOptions* New() const { return New(NULL); }
|
| +
|
| + FileOptions* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const FileOptions& from);
|
| @@ -1464,6 +1851,14 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(FileOptions* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -1498,101 +1893,146 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
|
| // accessors -------------------------------------------------------
|
|
|
| // optional string java_package = 1;
|
| - inline bool has_java_package() const;
|
| - inline void clear_java_package();
|
| + bool has_java_package() const;
|
| + void clear_java_package();
|
| static const int kJavaPackageFieldNumber = 1;
|
| - inline const ::std::string& java_package() const;
|
| - inline void set_java_package(const ::std::string& value);
|
| - inline void set_java_package(const char* value);
|
| - inline void set_java_package(const char* value, size_t size);
|
| - inline ::std::string* mutable_java_package();
|
| - inline ::std::string* release_java_package();
|
| - inline void set_allocated_java_package(::std::string* java_package);
|
| + const ::std::string& java_package() const;
|
| + void set_java_package(const ::std::string& value);
|
| + void set_java_package(const char* value);
|
| + void set_java_package(const char* value, size_t size);
|
| + ::std::string* mutable_java_package();
|
| + ::std::string* release_java_package();
|
| + void set_allocated_java_package(::std::string* java_package);
|
|
|
| // optional string java_outer_classname = 8;
|
| - inline bool has_java_outer_classname() const;
|
| - inline void clear_java_outer_classname();
|
| + bool has_java_outer_classname() const;
|
| + void clear_java_outer_classname();
|
| static const int kJavaOuterClassnameFieldNumber = 8;
|
| - inline const ::std::string& java_outer_classname() const;
|
| - inline void set_java_outer_classname(const ::std::string& value);
|
| - inline void set_java_outer_classname(const char* value);
|
| - inline void set_java_outer_classname(const char* value, size_t size);
|
| - inline ::std::string* mutable_java_outer_classname();
|
| - inline ::std::string* release_java_outer_classname();
|
| - inline void set_allocated_java_outer_classname(::std::string* java_outer_classname);
|
| + const ::std::string& java_outer_classname() const;
|
| + void set_java_outer_classname(const ::std::string& value);
|
| + void set_java_outer_classname(const char* value);
|
| + void set_java_outer_classname(const char* value, size_t size);
|
| + ::std::string* mutable_java_outer_classname();
|
| + ::std::string* release_java_outer_classname();
|
| + void set_allocated_java_outer_classname(::std::string* java_outer_classname);
|
|
|
| // optional bool java_multiple_files = 10 [default = false];
|
| - inline bool has_java_multiple_files() const;
|
| - inline void clear_java_multiple_files();
|
| + bool has_java_multiple_files() const;
|
| + void clear_java_multiple_files();
|
| static const int kJavaMultipleFilesFieldNumber = 10;
|
| - inline bool java_multiple_files() const;
|
| - inline void set_java_multiple_files(bool value);
|
| -
|
| - // optional bool retain_unknown_fields = 12 [default = false];
|
| - inline bool has_retain_unknown_fields() const;
|
| - inline void clear_retain_unknown_fields();
|
| - static const int kRetainUnknownFieldsFieldNumber = 12;
|
| - inline bool retain_unknown_fields() const;
|
| - inline void set_retain_unknown_fields(bool value);
|
| + bool java_multiple_files() const;
|
| + void set_java_multiple_files(bool value);
|
|
|
| // optional bool java_generate_equals_and_hash = 20 [default = false];
|
| - inline bool has_java_generate_equals_and_hash() const;
|
| - inline void clear_java_generate_equals_and_hash();
|
| + bool has_java_generate_equals_and_hash() const;
|
| + void clear_java_generate_equals_and_hash();
|
| static const int kJavaGenerateEqualsAndHashFieldNumber = 20;
|
| - inline bool java_generate_equals_and_hash() const;
|
| - inline void set_java_generate_equals_and_hash(bool value);
|
| + bool java_generate_equals_and_hash() const;
|
| + void set_java_generate_equals_and_hash(bool value);
|
| +
|
| + // optional bool java_string_check_utf8 = 27 [default = false];
|
| + bool has_java_string_check_utf8() const;
|
| + void clear_java_string_check_utf8();
|
| + static const int kJavaStringCheckUtf8FieldNumber = 27;
|
| + bool java_string_check_utf8() const;
|
| + void set_java_string_check_utf8(bool value);
|
|
|
| // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
|
| - inline bool has_optimize_for() const;
|
| - inline void clear_optimize_for();
|
| + bool has_optimize_for() const;
|
| + void clear_optimize_for();
|
| static const int kOptimizeForFieldNumber = 9;
|
| - inline ::google::protobuf::FileOptions_OptimizeMode optimize_for() const;
|
| - inline void set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value);
|
| + ::google::protobuf::FileOptions_OptimizeMode optimize_for() const;
|
| + void set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value);
|
|
|
| // optional string go_package = 11;
|
| - inline bool has_go_package() const;
|
| - inline void clear_go_package();
|
| + bool has_go_package() const;
|
| + void clear_go_package();
|
| static const int kGoPackageFieldNumber = 11;
|
| - inline const ::std::string& go_package() const;
|
| - inline void set_go_package(const ::std::string& value);
|
| - inline void set_go_package(const char* value);
|
| - inline void set_go_package(const char* value, size_t size);
|
| - inline ::std::string* mutable_go_package();
|
| - inline ::std::string* release_go_package();
|
| - inline void set_allocated_go_package(::std::string* go_package);
|
| + const ::std::string& go_package() const;
|
| + void set_go_package(const ::std::string& value);
|
| + void set_go_package(const char* value);
|
| + void set_go_package(const char* value, size_t size);
|
| + ::std::string* mutable_go_package();
|
| + ::std::string* release_go_package();
|
| + void set_allocated_go_package(::std::string* go_package);
|
|
|
| // optional bool cc_generic_services = 16 [default = false];
|
| - inline bool has_cc_generic_services() const;
|
| - inline void clear_cc_generic_services();
|
| + bool has_cc_generic_services() const;
|
| + void clear_cc_generic_services();
|
| static const int kCcGenericServicesFieldNumber = 16;
|
| - inline bool cc_generic_services() const;
|
| - inline void set_cc_generic_services(bool value);
|
| + bool cc_generic_services() const;
|
| + void set_cc_generic_services(bool value);
|
|
|
| // optional bool java_generic_services = 17 [default = false];
|
| - inline bool has_java_generic_services() const;
|
| - inline void clear_java_generic_services();
|
| + bool has_java_generic_services() const;
|
| + void clear_java_generic_services();
|
| static const int kJavaGenericServicesFieldNumber = 17;
|
| - inline bool java_generic_services() const;
|
| - inline void set_java_generic_services(bool value);
|
| + bool java_generic_services() const;
|
| + void set_java_generic_services(bool value);
|
|
|
| // optional bool py_generic_services = 18 [default = false];
|
| - inline bool has_py_generic_services() const;
|
| - inline void clear_py_generic_services();
|
| + bool has_py_generic_services() const;
|
| + void clear_py_generic_services();
|
| static const int kPyGenericServicesFieldNumber = 18;
|
| - inline bool py_generic_services() const;
|
| - inline void set_py_generic_services(bool value);
|
| + bool py_generic_services() const;
|
| + void set_py_generic_services(bool value);
|
| +
|
| + // optional bool deprecated = 23 [default = false];
|
| + bool has_deprecated() const;
|
| + void clear_deprecated();
|
| + static const int kDeprecatedFieldNumber = 23;
|
| + bool deprecated() const;
|
| + void set_deprecated(bool value);
|
| +
|
| + // optional bool cc_enable_arenas = 31 [default = false];
|
| + bool has_cc_enable_arenas() const;
|
| + void clear_cc_enable_arenas();
|
| + static const int kCcEnableArenasFieldNumber = 31;
|
| + bool cc_enable_arenas() const;
|
| + void set_cc_enable_arenas(bool value);
|
| +
|
| + // optional string objc_class_prefix = 36;
|
| + bool has_objc_class_prefix() const;
|
| + void clear_objc_class_prefix();
|
| + static const int kObjcClassPrefixFieldNumber = 36;
|
| + const ::std::string& objc_class_prefix() const;
|
| + void set_objc_class_prefix(const ::std::string& value);
|
| + void set_objc_class_prefix(const char* value);
|
| + void set_objc_class_prefix(const char* value, size_t size);
|
| + ::std::string* mutable_objc_class_prefix();
|
| + ::std::string* release_objc_class_prefix();
|
| + void set_allocated_objc_class_prefix(::std::string* objc_class_prefix);
|
| +
|
| + // optional string csharp_namespace = 37;
|
| + bool has_csharp_namespace() const;
|
| + void clear_csharp_namespace();
|
| + static const int kCsharpNamespaceFieldNumber = 37;
|
| + const ::std::string& csharp_namespace() const;
|
| + void set_csharp_namespace(const ::std::string& value);
|
| + void set_csharp_namespace(const char* value);
|
| + void set_csharp_namespace(const char* value, size_t size);
|
| + ::std::string* mutable_csharp_namespace();
|
| + ::std::string* release_csharp_namespace();
|
| + void set_allocated_csharp_namespace(::std::string* csharp_namespace);
|
| +
|
| + // optional bool javanano_use_deprecated_package = 38;
|
| + bool has_javanano_use_deprecated_package() const;
|
| + void clear_javanano_use_deprecated_package();
|
| + static const int kJavananoUseDeprecatedPackageFieldNumber = 38;
|
| + bool javanano_use_deprecated_package() const;
|
| + void set_javanano_use_deprecated_package(bool value);
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - inline int uninterpreted_option_size() const;
|
| - inline void clear_uninterpreted_option();
|
| + int uninterpreted_option_size() const;
|
| + void clear_uninterpreted_option();
|
| static const int kUninterpretedOptionFieldNumber = 999;
|
| - inline const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| - inline ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| - inline ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| - uninterpreted_option() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| + const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| + ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| + ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| mutable_uninterpreted_option();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| + uninterpreted_option() const;
|
|
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(FileOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.FileOptions)
|
| @@ -1603,10 +2043,10 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
|
| inline void clear_has_java_outer_classname();
|
| inline void set_has_java_multiple_files();
|
| inline void clear_has_java_multiple_files();
|
| - inline void set_has_retain_unknown_fields();
|
| - inline void clear_has_retain_unknown_fields();
|
| inline void set_has_java_generate_equals_and_hash();
|
| inline void clear_has_java_generate_equals_and_hash();
|
| + inline void set_has_java_string_check_utf8();
|
| + inline void clear_has_java_string_check_utf8();
|
| inline void set_has_optimize_for();
|
| inline void clear_has_optimize_for();
|
| inline void set_has_go_package();
|
| @@ -1617,26 +2057,38 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
|
| inline void clear_has_java_generic_services();
|
| inline void set_has_py_generic_services();
|
| inline void clear_has_py_generic_services();
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
| + inline void set_has_cc_enable_arenas();
|
| + inline void clear_has_cc_enable_arenas();
|
| + inline void set_has_objc_class_prefix();
|
| + inline void clear_has_objc_class_prefix();
|
| + inline void set_has_csharp_namespace();
|
| + inline void clear_has_csharp_namespace();
|
| + inline void set_has_javanano_use_deprecated_package();
|
| + inline void clear_has_javanano_use_deprecated_package();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::std::string* java_package_;
|
| - ::std::string* java_outer_classname_;
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| + ::google::protobuf::internal::ArenaStringPtr java_package_;
|
| + ::google::protobuf::internal::ArenaStringPtr java_outer_classname_;
|
| bool java_multiple_files_;
|
| - bool retain_unknown_fields_;
|
| bool java_generate_equals_and_hash_;
|
| + bool java_string_check_utf8_;
|
| bool cc_generic_services_;
|
| int optimize_for_;
|
| - ::std::string* go_package_;
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| + ::google::protobuf::internal::ArenaStringPtr go_package_;
|
| bool java_generic_services_;
|
| bool py_generic_services_;
|
| -
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(11 + 31) / 32];
|
| -
|
| + bool deprecated_;
|
| + bool cc_enable_arenas_;
|
| + bool javanano_use_deprecated_package_;
|
| + ::google::protobuf::internal::ArenaStringPtr objc_class_prefix_;
|
| + ::google::protobuf::internal::ArenaStringPtr csharp_namespace_;
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -1659,11 +2111,11 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -1673,7 +2125,9 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - MessageOptions* New() const;
|
| + inline MessageOptions* New() const { return New(NULL); }
|
| +
|
| + MessageOptions* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const MessageOptions& from);
|
| @@ -1692,6 +2146,14 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(MessageOptions* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -1701,30 +2163,44 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {
|
| // accessors -------------------------------------------------------
|
|
|
| // optional bool message_set_wire_format = 1 [default = false];
|
| - inline bool has_message_set_wire_format() const;
|
| - inline void clear_message_set_wire_format();
|
| + bool has_message_set_wire_format() const;
|
| + void clear_message_set_wire_format();
|
| static const int kMessageSetWireFormatFieldNumber = 1;
|
| - inline bool message_set_wire_format() const;
|
| - inline void set_message_set_wire_format(bool value);
|
| + bool message_set_wire_format() const;
|
| + void set_message_set_wire_format(bool value);
|
|
|
| // optional bool no_standard_descriptor_accessor = 2 [default = false];
|
| - inline bool has_no_standard_descriptor_accessor() const;
|
| - inline void clear_no_standard_descriptor_accessor();
|
| + bool has_no_standard_descriptor_accessor() const;
|
| + void clear_no_standard_descriptor_accessor();
|
| static const int kNoStandardDescriptorAccessorFieldNumber = 2;
|
| - inline bool no_standard_descriptor_accessor() const;
|
| - inline void set_no_standard_descriptor_accessor(bool value);
|
| + bool no_standard_descriptor_accessor() const;
|
| + void set_no_standard_descriptor_accessor(bool value);
|
| +
|
| + // optional bool deprecated = 3 [default = false];
|
| + bool has_deprecated() const;
|
| + void clear_deprecated();
|
| + static const int kDeprecatedFieldNumber = 3;
|
| + bool deprecated() const;
|
| + void set_deprecated(bool value);
|
| +
|
| + // optional bool map_entry = 7;
|
| + bool has_map_entry() const;
|
| + void clear_map_entry();
|
| + static const int kMapEntryFieldNumber = 7;
|
| + bool map_entry() const;
|
| + void set_map_entry(bool value);
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - inline int uninterpreted_option_size() const;
|
| - inline void clear_uninterpreted_option();
|
| + int uninterpreted_option_size() const;
|
| + void clear_uninterpreted_option();
|
| static const int kUninterpretedOptionFieldNumber = 999;
|
| - inline const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| - inline ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| - inline ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| - uninterpreted_option() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| + const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| + ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| + ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| mutable_uninterpreted_option();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| + uninterpreted_option() const;
|
|
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(MessageOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.MessageOptions)
|
| @@ -1733,18 +2209,21 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {
|
| inline void clear_has_message_set_wire_format();
|
| inline void set_has_no_standard_descriptor_accessor();
|
| inline void clear_has_no_standard_descriptor_accessor();
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
| + inline void set_has_map_entry();
|
| + inline void clear_has_map_entry();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| bool message_set_wire_format_;
|
| bool no_standard_descriptor_accessor_;
|
| -
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
|
| -
|
| + bool deprecated_;
|
| + bool map_entry_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -1767,11 +2246,11 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -1781,7 +2260,9 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - FieldOptions* New() const;
|
| + inline FieldOptions* New() const { return New(NULL); }
|
| +
|
| + FieldOptions* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const FieldOptions& from);
|
| @@ -1800,6 +2281,14 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(FieldOptions* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -1831,66 +2320,86 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {
|
| return FieldOptions_CType_Parse(name, value);
|
| }
|
|
|
| + typedef FieldOptions_JSType JSType;
|
| + static const JSType JS_NORMAL = FieldOptions_JSType_JS_NORMAL;
|
| + static const JSType JS_STRING = FieldOptions_JSType_JS_STRING;
|
| + static const JSType JS_NUMBER = FieldOptions_JSType_JS_NUMBER;
|
| + static inline bool JSType_IsValid(int value) {
|
| + return FieldOptions_JSType_IsValid(value);
|
| + }
|
| + static const JSType JSType_MIN =
|
| + FieldOptions_JSType_JSType_MIN;
|
| + static const JSType JSType_MAX =
|
| + FieldOptions_JSType_JSType_MAX;
|
| + static const int JSType_ARRAYSIZE =
|
| + FieldOptions_JSType_JSType_ARRAYSIZE;
|
| + static inline const ::google::protobuf::EnumDescriptor*
|
| + JSType_descriptor() {
|
| + return FieldOptions_JSType_descriptor();
|
| + }
|
| + static inline const ::std::string& JSType_Name(JSType value) {
|
| + return FieldOptions_JSType_Name(value);
|
| + }
|
| + static inline bool JSType_Parse(const ::std::string& name,
|
| + JSType* value) {
|
| + return FieldOptions_JSType_Parse(name, value);
|
| + }
|
| +
|
| // accessors -------------------------------------------------------
|
|
|
| // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
|
| - inline bool has_ctype() const;
|
| - inline void clear_ctype();
|
| + bool has_ctype() const;
|
| + void clear_ctype();
|
| static const int kCtypeFieldNumber = 1;
|
| - inline ::google::protobuf::FieldOptions_CType ctype() const;
|
| - inline void set_ctype(::google::protobuf::FieldOptions_CType value);
|
| + ::google::protobuf::FieldOptions_CType ctype() const;
|
| + void set_ctype(::google::protobuf::FieldOptions_CType value);
|
|
|
| // optional bool packed = 2;
|
| - inline bool has_packed() const;
|
| - inline void clear_packed();
|
| + bool has_packed() const;
|
| + void clear_packed();
|
| static const int kPackedFieldNumber = 2;
|
| - inline bool packed() const;
|
| - inline void set_packed(bool value);
|
| + bool packed() const;
|
| + void set_packed(bool value);
|
| +
|
| + // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
|
| + bool has_jstype() const;
|
| + void clear_jstype();
|
| + static const int kJstypeFieldNumber = 6;
|
| + ::google::protobuf::FieldOptions_JSType jstype() const;
|
| + void set_jstype(::google::protobuf::FieldOptions_JSType value);
|
|
|
| // optional bool lazy = 5 [default = false];
|
| - inline bool has_lazy() const;
|
| - inline void clear_lazy();
|
| + bool has_lazy() const;
|
| + void clear_lazy();
|
| static const int kLazyFieldNumber = 5;
|
| - inline bool lazy() const;
|
| - inline void set_lazy(bool value);
|
| + bool lazy() const;
|
| + void set_lazy(bool value);
|
|
|
| // optional bool deprecated = 3 [default = false];
|
| - inline bool has_deprecated() const;
|
| - inline void clear_deprecated();
|
| + bool has_deprecated() const;
|
| + void clear_deprecated();
|
| static const int kDeprecatedFieldNumber = 3;
|
| - inline bool deprecated() const;
|
| - inline void set_deprecated(bool value);
|
| -
|
| - // optional string experimental_map_key = 9;
|
| - inline bool has_experimental_map_key() const;
|
| - inline void clear_experimental_map_key();
|
| - static const int kExperimentalMapKeyFieldNumber = 9;
|
| - inline const ::std::string& experimental_map_key() const;
|
| - inline void set_experimental_map_key(const ::std::string& value);
|
| - inline void set_experimental_map_key(const char* value);
|
| - inline void set_experimental_map_key(const char* value, size_t size);
|
| - inline ::std::string* mutable_experimental_map_key();
|
| - inline ::std::string* release_experimental_map_key();
|
| - inline void set_allocated_experimental_map_key(::std::string* experimental_map_key);
|
| + bool deprecated() const;
|
| + void set_deprecated(bool value);
|
|
|
| // optional bool weak = 10 [default = false];
|
| - inline bool has_weak() const;
|
| - inline void clear_weak();
|
| + bool has_weak() const;
|
| + void clear_weak();
|
| static const int kWeakFieldNumber = 10;
|
| - inline bool weak() const;
|
| - inline void set_weak(bool value);
|
| + bool weak() const;
|
| + void set_weak(bool value);
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - inline int uninterpreted_option_size() const;
|
| - inline void clear_uninterpreted_option();
|
| + int uninterpreted_option_size() const;
|
| + void clear_uninterpreted_option();
|
| static const int kUninterpretedOptionFieldNumber = 999;
|
| - inline const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| - inline ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| - inline ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| - uninterpreted_option() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| + const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| + ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| + ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| mutable_uninterpreted_option();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| + uninterpreted_option() const;
|
|
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(FieldOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.FieldOptions)
|
| @@ -1899,30 +2408,27 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {
|
| inline void clear_has_ctype();
|
| inline void set_has_packed();
|
| inline void clear_has_packed();
|
| + inline void set_has_jstype();
|
| + inline void clear_has_jstype();
|
| inline void set_has_lazy();
|
| inline void clear_has_lazy();
|
| inline void set_has_deprecated();
|
| inline void clear_has_deprecated();
|
| - inline void set_has_experimental_map_key();
|
| - inline void clear_has_experimental_map_key();
|
| inline void set_has_weak();
|
| inline void clear_has_weak();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| int ctype_;
|
| + int jstype_;
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| bool packed_;
|
| bool lazy_;
|
| bool deprecated_;
|
| bool weak_;
|
| - ::std::string* experimental_map_key_;
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| -
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
|
| -
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -1945,11 +2451,11 @@ class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message {
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -1959,7 +2465,9 @@ class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message {
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - EnumOptions* New() const;
|
| + inline EnumOptions* New() const { return New(NULL); }
|
| +
|
| + EnumOptions* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const EnumOptions& from);
|
| @@ -1978,6 +2486,14 @@ class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message {
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(EnumOptions* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -1986,41 +2502,48 @@ class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message {
|
|
|
| // accessors -------------------------------------------------------
|
|
|
| - // optional bool allow_alias = 2 [default = true];
|
| - inline bool has_allow_alias() const;
|
| - inline void clear_allow_alias();
|
| + // optional bool allow_alias = 2;
|
| + bool has_allow_alias() const;
|
| + void clear_allow_alias();
|
| static const int kAllowAliasFieldNumber = 2;
|
| - inline bool allow_alias() const;
|
| - inline void set_allow_alias(bool value);
|
| + bool allow_alias() const;
|
| + void set_allow_alias(bool value);
|
| +
|
| + // optional bool deprecated = 3 [default = false];
|
| + bool has_deprecated() const;
|
| + void clear_deprecated();
|
| + static const int kDeprecatedFieldNumber = 3;
|
| + bool deprecated() const;
|
| + void set_deprecated(bool value);
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - inline int uninterpreted_option_size() const;
|
| - inline void clear_uninterpreted_option();
|
| + int uninterpreted_option_size() const;
|
| + void clear_uninterpreted_option();
|
| static const int kUninterpretedOptionFieldNumber = 999;
|
| - inline const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| - inline ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| - inline ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| - uninterpreted_option() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| + const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| + ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| + ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| mutable_uninterpreted_option();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| + uninterpreted_option() const;
|
|
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(EnumOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.EnumOptions)
|
| private:
|
| inline void set_has_allow_alias();
|
| inline void clear_has_allow_alias();
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| bool allow_alias_;
|
| -
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
|
| -
|
| + bool deprecated_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -2043,11 +2566,11 @@ class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message {
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -2057,7 +2580,9 @@ class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message {
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - EnumValueOptions* New() const;
|
| + inline EnumValueOptions* New() const { return New(NULL); }
|
| +
|
| + EnumValueOptions* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const EnumValueOptions& from);
|
| @@ -2076,6 +2601,14 @@ class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message {
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(EnumValueOptions* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -2084,31 +2617,38 @@ class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message {
|
|
|
| // accessors -------------------------------------------------------
|
|
|
| + // optional bool deprecated = 1 [default = false];
|
| + bool has_deprecated() const;
|
| + void clear_deprecated();
|
| + static const int kDeprecatedFieldNumber = 1;
|
| + bool deprecated() const;
|
| + void set_deprecated(bool value);
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - inline int uninterpreted_option_size() const;
|
| - inline void clear_uninterpreted_option();
|
| + int uninterpreted_option_size() const;
|
| + void clear_uninterpreted_option();
|
| static const int kUninterpretedOptionFieldNumber = 999;
|
| - inline const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| - inline ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| - inline ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| - uninterpreted_option() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| + const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| + ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| + ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| mutable_uninterpreted_option();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| + uninterpreted_option() const;
|
|
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(EnumValueOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.EnumValueOptions)
|
| private:
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
|
| -
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| + bool deprecated_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -2131,11 +2671,11 @@ class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message {
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -2145,7 +2685,9 @@ class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message {
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - ServiceOptions* New() const;
|
| + inline ServiceOptions* New() const { return New(NULL); }
|
| +
|
| + ServiceOptions* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const ServiceOptions& from);
|
| @@ -2164,6 +2706,14 @@ class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message {
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(ServiceOptions* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -2172,31 +2722,38 @@ class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message {
|
|
|
| // accessors -------------------------------------------------------
|
|
|
| + // optional bool deprecated = 33 [default = false];
|
| + bool has_deprecated() const;
|
| + void clear_deprecated();
|
| + static const int kDeprecatedFieldNumber = 33;
|
| + bool deprecated() const;
|
| + void set_deprecated(bool value);
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - inline int uninterpreted_option_size() const;
|
| - inline void clear_uninterpreted_option();
|
| + int uninterpreted_option_size() const;
|
| + void clear_uninterpreted_option();
|
| static const int kUninterpretedOptionFieldNumber = 999;
|
| - inline const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| - inline ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| - inline ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| - uninterpreted_option() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| + const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| + ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| + ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| mutable_uninterpreted_option();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| + uninterpreted_option() const;
|
|
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(ServiceOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.ServiceOptions)
|
| private:
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
|
| -
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| + bool deprecated_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -2219,11 +2776,11 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -2233,7 +2790,9 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - MethodOptions* New() const;
|
| + inline MethodOptions* New() const { return New(NULL); }
|
| +
|
| + MethodOptions* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const MethodOptions& from);
|
| @@ -2252,6 +2811,14 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(MethodOptions* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -2260,31 +2827,38 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {
|
|
|
| // accessors -------------------------------------------------------
|
|
|
| + // optional bool deprecated = 33 [default = false];
|
| + bool has_deprecated() const;
|
| + void clear_deprecated();
|
| + static const int kDeprecatedFieldNumber = 33;
|
| + bool deprecated() const;
|
| + void set_deprecated(bool value);
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - inline int uninterpreted_option_size() const;
|
| - inline void clear_uninterpreted_option();
|
| + int uninterpreted_option_size() const;
|
| + void clear_uninterpreted_option();
|
| static const int kUninterpretedOptionFieldNumber = 999;
|
| - inline const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| - inline ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| - inline ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| - uninterpreted_option() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| + const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| + ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| + ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| mutable_uninterpreted_option();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| + uninterpreted_option() const;
|
|
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(MethodOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.MethodOptions)
|
| private:
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
|
| -
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| + bool deprecated_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -2307,11 +2881,11 @@ class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobu
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -2321,7 +2895,9 @@ class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobu
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - UninterpretedOption_NamePart* New() const;
|
| + inline UninterpretedOption_NamePart* New() const { return New(NULL); }
|
| +
|
| + UninterpretedOption_NamePart* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const UninterpretedOption_NamePart& from);
|
| @@ -2340,6 +2916,14 @@ class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobu
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(UninterpretedOption_NamePart* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -2349,23 +2933,23 @@ class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobu
|
| // accessors -------------------------------------------------------
|
|
|
| // required string name_part = 1;
|
| - inline bool has_name_part() const;
|
| - inline void clear_name_part();
|
| + bool has_name_part() const;
|
| + void clear_name_part();
|
| static const int kNamePartFieldNumber = 1;
|
| - inline const ::std::string& name_part() const;
|
| - inline void set_name_part(const ::std::string& value);
|
| - inline void set_name_part(const char* value);
|
| - inline void set_name_part(const char* value, size_t size);
|
| - inline ::std::string* mutable_name_part();
|
| - inline ::std::string* release_name_part();
|
| - inline void set_allocated_name_part(::std::string* name_part);
|
| + const ::std::string& name_part() const;
|
| + void set_name_part(const ::std::string& value);
|
| + void set_name_part(const char* value);
|
| + void set_name_part(const char* value, size_t size);
|
| + ::std::string* mutable_name_part();
|
| + ::std::string* release_name_part();
|
| + void set_allocated_name_part(::std::string* name_part);
|
|
|
| // required bool is_extension = 2;
|
| - inline bool has_is_extension() const;
|
| - inline void clear_is_extension();
|
| + bool has_is_extension() const;
|
| + void clear_is_extension();
|
| static const int kIsExtensionFieldNumber = 2;
|
| - inline bool is_extension() const;
|
| - inline void set_is_extension(bool value);
|
| + bool is_extension() const;
|
| + void set_is_extension(bool value);
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.UninterpretedOption.NamePart)
|
| private:
|
| @@ -2374,14 +2958,14 @@ class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobu
|
| inline void set_has_is_extension();
|
| inline void clear_has_is_extension();
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::std::string* name_part_;
|
| - bool is_extension_;
|
| + // helper for ByteSize()
|
| + int RequiredFieldsByteSizeFallback() const;
|
|
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
|
| -
|
| + ::google::protobuf::internal::ArenaStringPtr name_part_;
|
| + bool is_extension_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -2404,11 +2988,11 @@ class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Messag
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -2418,7 +3002,9 @@ class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Messag
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - UninterpretedOption* New() const;
|
| + inline UninterpretedOption* New() const { return New(NULL); }
|
| +
|
| + UninterpretedOption* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const UninterpretedOption& from);
|
| @@ -2437,6 +3023,14 @@ class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Messag
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(UninterpretedOption* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -2448,73 +3042,73 @@ class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Messag
|
| // accessors -------------------------------------------------------
|
|
|
| // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
|
| - inline int name_size() const;
|
| - inline void clear_name();
|
| + int name_size() const;
|
| + void clear_name();
|
| static const int kNameFieldNumber = 2;
|
| - inline const ::google::protobuf::UninterpretedOption_NamePart& name(int index) const;
|
| - inline ::google::protobuf::UninterpretedOption_NamePart* mutable_name(int index);
|
| - inline ::google::protobuf::UninterpretedOption_NamePart* add_name();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >&
|
| - name() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >*
|
| + const ::google::protobuf::UninterpretedOption_NamePart& name(int index) const;
|
| + ::google::protobuf::UninterpretedOption_NamePart* mutable_name(int index);
|
| + ::google::protobuf::UninterpretedOption_NamePart* add_name();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >*
|
| mutable_name();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >&
|
| + name() const;
|
|
|
| // optional string identifier_value = 3;
|
| - inline bool has_identifier_value() const;
|
| - inline void clear_identifier_value();
|
| + bool has_identifier_value() const;
|
| + void clear_identifier_value();
|
| static const int kIdentifierValueFieldNumber = 3;
|
| - inline const ::std::string& identifier_value() const;
|
| - inline void set_identifier_value(const ::std::string& value);
|
| - inline void set_identifier_value(const char* value);
|
| - inline void set_identifier_value(const char* value, size_t size);
|
| - inline ::std::string* mutable_identifier_value();
|
| - inline ::std::string* release_identifier_value();
|
| - inline void set_allocated_identifier_value(::std::string* identifier_value);
|
| + const ::std::string& identifier_value() const;
|
| + void set_identifier_value(const ::std::string& value);
|
| + void set_identifier_value(const char* value);
|
| + void set_identifier_value(const char* value, size_t size);
|
| + ::std::string* mutable_identifier_value();
|
| + ::std::string* release_identifier_value();
|
| + void set_allocated_identifier_value(::std::string* identifier_value);
|
|
|
| // optional uint64 positive_int_value = 4;
|
| - inline bool has_positive_int_value() const;
|
| - inline void clear_positive_int_value();
|
| + bool has_positive_int_value() const;
|
| + void clear_positive_int_value();
|
| static const int kPositiveIntValueFieldNumber = 4;
|
| - inline ::google::protobuf::uint64 positive_int_value() const;
|
| - inline void set_positive_int_value(::google::protobuf::uint64 value);
|
| + ::google::protobuf::uint64 positive_int_value() const;
|
| + void set_positive_int_value(::google::protobuf::uint64 value);
|
|
|
| // optional int64 negative_int_value = 5;
|
| - inline bool has_negative_int_value() const;
|
| - inline void clear_negative_int_value();
|
| + bool has_negative_int_value() const;
|
| + void clear_negative_int_value();
|
| static const int kNegativeIntValueFieldNumber = 5;
|
| - inline ::google::protobuf::int64 negative_int_value() const;
|
| - inline void set_negative_int_value(::google::protobuf::int64 value);
|
| + ::google::protobuf::int64 negative_int_value() const;
|
| + void set_negative_int_value(::google::protobuf::int64 value);
|
|
|
| // optional double double_value = 6;
|
| - inline bool has_double_value() const;
|
| - inline void clear_double_value();
|
| + bool has_double_value() const;
|
| + void clear_double_value();
|
| static const int kDoubleValueFieldNumber = 6;
|
| - inline double double_value() const;
|
| - inline void set_double_value(double value);
|
| + double double_value() const;
|
| + void set_double_value(double value);
|
|
|
| // optional bytes string_value = 7;
|
| - inline bool has_string_value() const;
|
| - inline void clear_string_value();
|
| + bool has_string_value() const;
|
| + void clear_string_value();
|
| static const int kStringValueFieldNumber = 7;
|
| - inline const ::std::string& string_value() const;
|
| - inline void set_string_value(const ::std::string& value);
|
| - inline void set_string_value(const char* value);
|
| - inline void set_string_value(const void* value, size_t size);
|
| - inline ::std::string* mutable_string_value();
|
| - inline ::std::string* release_string_value();
|
| - inline void set_allocated_string_value(::std::string* string_value);
|
| + const ::std::string& string_value() const;
|
| + void set_string_value(const ::std::string& value);
|
| + void set_string_value(const char* value);
|
| + void set_string_value(const void* value, size_t size);
|
| + ::std::string* mutable_string_value();
|
| + ::std::string* release_string_value();
|
| + void set_allocated_string_value(::std::string* string_value);
|
|
|
| // optional string aggregate_value = 8;
|
| - inline bool has_aggregate_value() const;
|
| - inline void clear_aggregate_value();
|
| + bool has_aggregate_value() const;
|
| + void clear_aggregate_value();
|
| static const int kAggregateValueFieldNumber = 8;
|
| - inline const ::std::string& aggregate_value() const;
|
| - inline void set_aggregate_value(const ::std::string& value);
|
| - inline void set_aggregate_value(const char* value);
|
| - inline void set_aggregate_value(const char* value, size_t size);
|
| - inline ::std::string* mutable_aggregate_value();
|
| - inline ::std::string* release_aggregate_value();
|
| - inline void set_allocated_aggregate_value(::std::string* aggregate_value);
|
| + const ::std::string& aggregate_value() const;
|
| + void set_aggregate_value(const ::std::string& value);
|
| + void set_aggregate_value(const char* value);
|
| + void set_aggregate_value(const char* value, size_t size);
|
| + ::std::string* mutable_aggregate_value();
|
| + ::std::string* release_aggregate_value();
|
| + void set_allocated_aggregate_value(::std::string* aggregate_value);
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.UninterpretedOption)
|
| private:
|
| @@ -2531,19 +3125,16 @@ class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Messag
|
| inline void set_has_aggregate_value();
|
| inline void clear_has_aggregate_value();
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart > name_;
|
| - ::std::string* identifier_value_;
|
| + ::google::protobuf::internal::ArenaStringPtr identifier_value_;
|
| ::google::protobuf::uint64 positive_int_value_;
|
| ::google::protobuf::int64 negative_int_value_;
|
| double double_value_;
|
| - ::std::string* string_value_;
|
| - ::std::string* aggregate_value_;
|
| -
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
|
| -
|
| + ::google::protobuf::internal::ArenaStringPtr string_value_;
|
| + ::google::protobuf::internal::ArenaStringPtr aggregate_value_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -2566,11 +3157,11 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Me
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -2580,7 +3171,9 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Me
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - SourceCodeInfo_Location* New() const;
|
| + inline SourceCodeInfo_Location* New() const { return New(NULL); }
|
| +
|
| + SourceCodeInfo_Location* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const SourceCodeInfo_Location& from);
|
| @@ -2599,6 +3192,14 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Me
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(SourceCodeInfo_Location* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -2608,52 +3209,68 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Me
|
| // accessors -------------------------------------------------------
|
|
|
| // repeated int32 path = 1 [packed = true];
|
| - inline int path_size() const;
|
| - inline void clear_path();
|
| + int path_size() const;
|
| + void clear_path();
|
| static const int kPathFieldNumber = 1;
|
| - inline ::google::protobuf::int32 path(int index) const;
|
| - inline void set_path(int index, ::google::protobuf::int32 value);
|
| - inline void add_path(::google::protobuf::int32 value);
|
| - inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| + ::google::protobuf::int32 path(int index) const;
|
| + void set_path(int index, ::google::protobuf::int32 value);
|
| + void add_path(::google::protobuf::int32 value);
|
| + const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| path() const;
|
| - inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| + ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| mutable_path();
|
|
|
| // repeated int32 span = 2 [packed = true];
|
| - inline int span_size() const;
|
| - inline void clear_span();
|
| + int span_size() const;
|
| + void clear_span();
|
| static const int kSpanFieldNumber = 2;
|
| - inline ::google::protobuf::int32 span(int index) const;
|
| - inline void set_span(int index, ::google::protobuf::int32 value);
|
| - inline void add_span(::google::protobuf::int32 value);
|
| - inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| + ::google::protobuf::int32 span(int index) const;
|
| + void set_span(int index, ::google::protobuf::int32 value);
|
| + void add_span(::google::protobuf::int32 value);
|
| + const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| span() const;
|
| - inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| + ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| mutable_span();
|
|
|
| // optional string leading_comments = 3;
|
| - inline bool has_leading_comments() const;
|
| - inline void clear_leading_comments();
|
| + bool has_leading_comments() const;
|
| + void clear_leading_comments();
|
| static const int kLeadingCommentsFieldNumber = 3;
|
| - inline const ::std::string& leading_comments() const;
|
| - inline void set_leading_comments(const ::std::string& value);
|
| - inline void set_leading_comments(const char* value);
|
| - inline void set_leading_comments(const char* value, size_t size);
|
| - inline ::std::string* mutable_leading_comments();
|
| - inline ::std::string* release_leading_comments();
|
| - inline void set_allocated_leading_comments(::std::string* leading_comments);
|
| + const ::std::string& leading_comments() const;
|
| + void set_leading_comments(const ::std::string& value);
|
| + void set_leading_comments(const char* value);
|
| + void set_leading_comments(const char* value, size_t size);
|
| + ::std::string* mutable_leading_comments();
|
| + ::std::string* release_leading_comments();
|
| + void set_allocated_leading_comments(::std::string* leading_comments);
|
|
|
| // optional string trailing_comments = 4;
|
| - inline bool has_trailing_comments() const;
|
| - inline void clear_trailing_comments();
|
| + bool has_trailing_comments() const;
|
| + void clear_trailing_comments();
|
| static const int kTrailingCommentsFieldNumber = 4;
|
| - inline const ::std::string& trailing_comments() const;
|
| - inline void set_trailing_comments(const ::std::string& value);
|
| - inline void set_trailing_comments(const char* value);
|
| - inline void set_trailing_comments(const char* value, size_t size);
|
| - inline ::std::string* mutable_trailing_comments();
|
| - inline ::std::string* release_trailing_comments();
|
| - inline void set_allocated_trailing_comments(::std::string* trailing_comments);
|
| + const ::std::string& trailing_comments() const;
|
| + void set_trailing_comments(const ::std::string& value);
|
| + void set_trailing_comments(const char* value);
|
| + void set_trailing_comments(const char* value, size_t size);
|
| + ::std::string* mutable_trailing_comments();
|
| + ::std::string* release_trailing_comments();
|
| + void set_allocated_trailing_comments(::std::string* trailing_comments);
|
| +
|
| + // repeated string leading_detached_comments = 6;
|
| + int leading_detached_comments_size() const;
|
| + void clear_leading_detached_comments();
|
| + static const int kLeadingDetachedCommentsFieldNumber = 6;
|
| + const ::std::string& leading_detached_comments(int index) const;
|
| + ::std::string* mutable_leading_detached_comments(int index);
|
| + void set_leading_detached_comments(int index, const ::std::string& value);
|
| + void set_leading_detached_comments(int index, const char* value);
|
| + void set_leading_detached_comments(int index, const char* value, size_t size);
|
| + ::std::string* add_leading_detached_comments();
|
| + void add_leading_detached_comments(const ::std::string& value);
|
| + void add_leading_detached_comments(const char* value);
|
| + void add_leading_detached_comments(const char* value, size_t size);
|
| + const ::google::protobuf::RepeatedPtrField< ::std::string>& leading_detached_comments() const;
|
| + ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_leading_detached_comments();
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.SourceCodeInfo.Location)
|
| private:
|
| @@ -2662,18 +3279,16 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Me
|
| inline void set_has_trailing_comments();
|
| inline void clear_has_trailing_comments();
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| + mutable int _cached_size_;
|
| ::google::protobuf::RepeatedField< ::google::protobuf::int32 > path_;
|
| mutable int _path_cached_byte_size_;
|
| ::google::protobuf::RepeatedField< ::google::protobuf::int32 > span_;
|
| mutable int _span_cached_byte_size_;
|
| - ::std::string* leading_comments_;
|
| - ::std::string* trailing_comments_;
|
| -
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
|
| -
|
| + ::google::protobuf::internal::ArenaStringPtr leading_comments_;
|
| + ::google::protobuf::internal::ArenaStringPtr trailing_comments_;
|
| + ::google::protobuf::RepeatedPtrField< ::std::string> leading_detached_comments_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -2696,11 +3311,11 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message {
|
| }
|
|
|
| inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _unknown_fields_;
|
| + return _internal_metadata_.unknown_fields();
|
| }
|
|
|
| inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return &_unknown_fields_;
|
| + return _internal_metadata_.mutable_unknown_fields();
|
| }
|
|
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| @@ -2710,7 +3325,9 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message {
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - SourceCodeInfo* New() const;
|
| + inline SourceCodeInfo* New() const { return New(NULL); }
|
| +
|
| + SourceCodeInfo* New(::google::protobuf::Arena* arena) const;
|
| void CopyFrom(const ::google::protobuf::Message& from);
|
| void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const SourceCodeInfo& from);
|
| @@ -2729,6 +3346,14 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message {
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| + void InternalSwap(SourceCodeInfo* other);
|
| + private:
|
| + inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| + return _internal_metadata_.arena();
|
| + }
|
| + inline void* MaybeArenaPtr() const {
|
| + return _internal_metadata_.raw_arena_ptr();
|
| + }
|
| public:
|
|
|
| ::google::protobuf::Metadata GetMetadata() const;
|
| @@ -2740,27 +3365,24 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message {
|
| // accessors -------------------------------------------------------
|
|
|
| // repeated .google.protobuf.SourceCodeInfo.Location location = 1;
|
| - inline int location_size() const;
|
| - inline void clear_location();
|
| + int location_size() const;
|
| + void clear_location();
|
| static const int kLocationFieldNumber = 1;
|
| - inline const ::google::protobuf::SourceCodeInfo_Location& location(int index) const;
|
| - inline ::google::protobuf::SourceCodeInfo_Location* mutable_location(int index);
|
| - inline ::google::protobuf::SourceCodeInfo_Location* add_location();
|
| - inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location >&
|
| - location() const;
|
| - inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location >*
|
| + const ::google::protobuf::SourceCodeInfo_Location& location(int index) const;
|
| + ::google::protobuf::SourceCodeInfo_Location* mutable_location(int index);
|
| + ::google::protobuf::SourceCodeInfo_Location* add_location();
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location >*
|
| mutable_location();
|
| + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location >&
|
| + location() const;
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.SourceCodeInfo)
|
| private:
|
|
|
| - ::google::protobuf::UnknownFieldSet _unknown_fields_;
|
| -
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location > location_;
|
| -
|
| + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| - ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
|
| -
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location > location_;
|
| friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| @@ -2773,6 +3395,7 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message {
|
|
|
| // ===================================================================
|
|
|
| +#if !PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // FileDescriptorSet
|
|
|
| // repeated .google.protobuf.FileDescriptorProto file = 1;
|
| @@ -2783,22 +3406,27 @@ inline void FileDescriptorSet::clear_file() {
|
| file_.Clear();
|
| }
|
| inline const ::google::protobuf::FileDescriptorProto& FileDescriptorSet::file(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorSet.file)
|
| return file_.Get(index);
|
| }
|
| inline ::google::protobuf::FileDescriptorProto* FileDescriptorSet::mutable_file(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorSet.file)
|
| return file_.Mutable(index);
|
| }
|
| inline ::google::protobuf::FileDescriptorProto* FileDescriptorSet::add_file() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorSet.file)
|
| return file_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >&
|
| -FileDescriptorSet::file() const {
|
| - return file_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >*
|
| FileDescriptorSet::mutable_file() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorSet.file)
|
| return &file_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >&
|
| +FileDescriptorSet::file() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorSet.file)
|
| + return file_;
|
| +}
|
|
|
| // -------------------------------------------------------------------
|
|
|
| @@ -2815,63 +3443,46 @@ inline void FileDescriptorProto::clear_has_name() {
|
| _has_bits_[0] &= ~0x00000001u;
|
| }
|
| inline void FileDescriptorProto::clear_name() {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - name_->clear();
|
| - }
|
| + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_name();
|
| }
|
| inline const ::std::string& FileDescriptorProto::name() const {
|
| - return *name_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.name)
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.name)
|
| }
|
| inline void FileDescriptorProto::set_name(const char* value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.name)
|
| }
|
| inline void FileDescriptorProto::set_name(const char* value, size_t size) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(reinterpret_cast<const char*>(value), size);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.name)
|
| }
|
| inline ::std::string* FileDescriptorProto::mutable_name() {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - return name_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.name)
|
| + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* FileDescriptorProto::release_name() {
|
| clear_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = name_;
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete name_;
|
| - }
|
| - if (name) {
|
| + if (name != NULL) {
|
| set_has_name();
|
| - name_ = name;
|
| } else {
|
| clear_has_name();
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.name)
|
| }
|
|
|
| // optional string package = 2;
|
| @@ -2885,63 +3496,46 @@ inline void FileDescriptorProto::clear_has_package() {
|
| _has_bits_[0] &= ~0x00000002u;
|
| }
|
| inline void FileDescriptorProto::clear_package() {
|
| - if (package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - package_->clear();
|
| - }
|
| + package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_package();
|
| }
|
| inline const ::std::string& FileDescriptorProto::package() const {
|
| - return *package_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.package)
|
| + return package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileDescriptorProto::set_package(const ::std::string& value) {
|
| set_has_package();
|
| - if (package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - package_ = new ::std::string;
|
| - }
|
| - package_->assign(value);
|
| + package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.package)
|
| }
|
| inline void FileDescriptorProto::set_package(const char* value) {
|
| set_has_package();
|
| - if (package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - package_ = new ::std::string;
|
| - }
|
| - package_->assign(value);
|
| + package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.package)
|
| }
|
| inline void FileDescriptorProto::set_package(const char* value, size_t size) {
|
| set_has_package();
|
| - if (package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - package_ = new ::std::string;
|
| - }
|
| - package_->assign(reinterpret_cast<const char*>(value), size);
|
| + package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.package)
|
| }
|
| inline ::std::string* FileDescriptorProto::mutable_package() {
|
| set_has_package();
|
| - if (package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - package_ = new ::std::string;
|
| - }
|
| - return package_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.package)
|
| + return package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* FileDescriptorProto::release_package() {
|
| clear_has_package();
|
| - if (package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = package_;
|
| - package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileDescriptorProto::set_allocated_package(::std::string* package) {
|
| - if (package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete package_;
|
| - }
|
| - if (package) {
|
| + if (package != NULL) {
|
| set_has_package();
|
| - package_ = package;
|
| } else {
|
| clear_has_package();
|
| - package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + package_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), package);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.package)
|
| }
|
|
|
| // repeated string dependency = 3;
|
| @@ -2952,39 +3546,49 @@ inline void FileDescriptorProto::clear_dependency() {
|
| dependency_.Clear();
|
| }
|
| inline const ::std::string& FileDescriptorProto::dependency(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.dependency)
|
| return dependency_.Get(index);
|
| }
|
| inline ::std::string* FileDescriptorProto::mutable_dependency(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.dependency)
|
| return dependency_.Mutable(index);
|
| }
|
| inline void FileDescriptorProto::set_dependency(int index, const ::std::string& value) {
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.dependency)
|
| dependency_.Mutable(index)->assign(value);
|
| }
|
| inline void FileDescriptorProto::set_dependency(int index, const char* value) {
|
| dependency_.Mutable(index)->assign(value);
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.dependency)
|
| }
|
| inline void FileDescriptorProto::set_dependency(int index, const char* value, size_t size) {
|
| dependency_.Mutable(index)->assign(
|
| reinterpret_cast<const char*>(value), size);
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.dependency)
|
| }
|
| inline ::std::string* FileDescriptorProto::add_dependency() {
|
| return dependency_.Add();
|
| }
|
| inline void FileDescriptorProto::add_dependency(const ::std::string& value) {
|
| dependency_.Add()->assign(value);
|
| + // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.dependency)
|
| }
|
| inline void FileDescriptorProto::add_dependency(const char* value) {
|
| dependency_.Add()->assign(value);
|
| + // @@protoc_insertion_point(field_add_char:google.protobuf.FileDescriptorProto.dependency)
|
| }
|
| inline void FileDescriptorProto::add_dependency(const char* value, size_t size) {
|
| dependency_.Add()->assign(reinterpret_cast<const char*>(value), size);
|
| + // @@protoc_insertion_point(field_add_pointer:google.protobuf.FileDescriptorProto.dependency)
|
| }
|
| inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
|
| FileDescriptorProto::dependency() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.dependency)
|
| return dependency_;
|
| }
|
| inline ::google::protobuf::RepeatedPtrField< ::std::string>*
|
| FileDescriptorProto::mutable_dependency() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.dependency)
|
| return &dependency_;
|
| }
|
|
|
| @@ -2996,20 +3600,25 @@ inline void FileDescriptorProto::clear_public_dependency() {
|
| public_dependency_.Clear();
|
| }
|
| inline ::google::protobuf::int32 FileDescriptorProto::public_dependency(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.public_dependency)
|
| return public_dependency_.Get(index);
|
| }
|
| inline void FileDescriptorProto::set_public_dependency(int index, ::google::protobuf::int32 value) {
|
| public_dependency_.Set(index, value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.public_dependency)
|
| }
|
| inline void FileDescriptorProto::add_public_dependency(::google::protobuf::int32 value) {
|
| public_dependency_.Add(value);
|
| + // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.public_dependency)
|
| }
|
| inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| FileDescriptorProto::public_dependency() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.public_dependency)
|
| return public_dependency_;
|
| }
|
| inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| FileDescriptorProto::mutable_public_dependency() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.public_dependency)
|
| return &public_dependency_;
|
| }
|
|
|
| @@ -3021,20 +3630,25 @@ inline void FileDescriptorProto::clear_weak_dependency() {
|
| weak_dependency_.Clear();
|
| }
|
| inline ::google::protobuf::int32 FileDescriptorProto::weak_dependency(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.weak_dependency)
|
| return weak_dependency_.Get(index);
|
| }
|
| inline void FileDescriptorProto::set_weak_dependency(int index, ::google::protobuf::int32 value) {
|
| weak_dependency_.Set(index, value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.weak_dependency)
|
| }
|
| inline void FileDescriptorProto::add_weak_dependency(::google::protobuf::int32 value) {
|
| weak_dependency_.Add(value);
|
| + // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.weak_dependency)
|
| }
|
| inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| FileDescriptorProto::weak_dependency() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.weak_dependency)
|
| return weak_dependency_;
|
| }
|
| inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| FileDescriptorProto::mutable_weak_dependency() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.weak_dependency)
|
| return &weak_dependency_;
|
| }
|
|
|
| @@ -3046,22 +3660,27 @@ inline void FileDescriptorProto::clear_message_type() {
|
| message_type_.Clear();
|
| }
|
| inline const ::google::protobuf::DescriptorProto& FileDescriptorProto::message_type(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.message_type)
|
| return message_type_.Get(index);
|
| }
|
| inline ::google::protobuf::DescriptorProto* FileDescriptorProto::mutable_message_type(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.message_type)
|
| return message_type_.Mutable(index);
|
| }
|
| inline ::google::protobuf::DescriptorProto* FileDescriptorProto::add_message_type() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.message_type)
|
| return message_type_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >&
|
| -FileDescriptorProto::message_type() const {
|
| - return message_type_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >*
|
| FileDescriptorProto::mutable_message_type() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.message_type)
|
| return &message_type_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >&
|
| +FileDescriptorProto::message_type() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.message_type)
|
| + return message_type_;
|
| +}
|
|
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
|
| inline int FileDescriptorProto::enum_type_size() const {
|
| @@ -3071,22 +3690,27 @@ inline void FileDescriptorProto::clear_enum_type() {
|
| enum_type_.Clear();
|
| }
|
| inline const ::google::protobuf::EnumDescriptorProto& FileDescriptorProto::enum_type(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.enum_type)
|
| return enum_type_.Get(index);
|
| }
|
| inline ::google::protobuf::EnumDescriptorProto* FileDescriptorProto::mutable_enum_type(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.enum_type)
|
| return enum_type_.Mutable(index);
|
| }
|
| inline ::google::protobuf::EnumDescriptorProto* FileDescriptorProto::add_enum_type() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.enum_type)
|
| return enum_type_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >&
|
| -FileDescriptorProto::enum_type() const {
|
| - return enum_type_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >*
|
| FileDescriptorProto::mutable_enum_type() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.enum_type)
|
| return &enum_type_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >&
|
| +FileDescriptorProto::enum_type() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.enum_type)
|
| + return enum_type_;
|
| +}
|
|
|
| // repeated .google.protobuf.ServiceDescriptorProto service = 6;
|
| inline int FileDescriptorProto::service_size() const {
|
| @@ -3096,22 +3720,27 @@ inline void FileDescriptorProto::clear_service() {
|
| service_.Clear();
|
| }
|
| inline const ::google::protobuf::ServiceDescriptorProto& FileDescriptorProto::service(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.service)
|
| return service_.Get(index);
|
| }
|
| inline ::google::protobuf::ServiceDescriptorProto* FileDescriptorProto::mutable_service(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.service)
|
| return service_.Mutable(index);
|
| }
|
| inline ::google::protobuf::ServiceDescriptorProto* FileDescriptorProto::add_service() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.service)
|
| return service_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto >&
|
| -FileDescriptorProto::service() const {
|
| - return service_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto >*
|
| FileDescriptorProto::mutable_service() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.service)
|
| return &service_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto >&
|
| +FileDescriptorProto::service() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.service)
|
| + return service_;
|
| +}
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 7;
|
| inline int FileDescriptorProto::extension_size() const {
|
| @@ -3121,22 +3750,27 @@ inline void FileDescriptorProto::clear_extension() {
|
| extension_.Clear();
|
| }
|
| inline const ::google::protobuf::FieldDescriptorProto& FileDescriptorProto::extension(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.extension)
|
| return extension_.Get(index);
|
| }
|
| inline ::google::protobuf::FieldDescriptorProto* FileDescriptorProto::mutable_extension(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.extension)
|
| return extension_.Mutable(index);
|
| }
|
| inline ::google::protobuf::FieldDescriptorProto* FileDescriptorProto::add_extension() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.extension)
|
| return extension_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| -FileDescriptorProto::extension() const {
|
| - return extension_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| FileDescriptorProto::mutable_extension() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.extension)
|
| return &extension_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| +FileDescriptorProto::extension() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.extension)
|
| + return extension_;
|
| +}
|
|
|
| // optional .google.protobuf.FileOptions options = 8;
|
| inline bool FileDescriptorProto::has_options() const {
|
| @@ -3153,11 +3787,15 @@ inline void FileDescriptorProto::clear_options() {
|
| clear_has_options();
|
| }
|
| inline const ::google::protobuf::FileOptions& FileDescriptorProto::options() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.options)
|
| return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::FileOptions* FileDescriptorProto::mutable_options() {
|
| set_has_options();
|
| - if (options_ == NULL) options_ = new ::google::protobuf::FileOptions;
|
| + if (options_ == NULL) {
|
| + options_ = new ::google::protobuf::FileOptions;
|
| + }
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.options)
|
| return options_;
|
| }
|
| inline ::google::protobuf::FileOptions* FileDescriptorProto::release_options() {
|
| @@ -3174,6 +3812,7 @@ inline void FileDescriptorProto::set_allocated_options(::google::protobuf::FileO
|
| } else {
|
| clear_has_options();
|
| }
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.options)
|
| }
|
|
|
| // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
|
| @@ -3191,11 +3830,15 @@ inline void FileDescriptorProto::clear_source_code_info() {
|
| clear_has_source_code_info();
|
| }
|
| inline const ::google::protobuf::SourceCodeInfo& FileDescriptorProto::source_code_info() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.source_code_info)
|
| return source_code_info_ != NULL ? *source_code_info_ : *default_instance_->source_code_info_;
|
| }
|
| inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::mutable_source_code_info() {
|
| set_has_source_code_info();
|
| - if (source_code_info_ == NULL) source_code_info_ = new ::google::protobuf::SourceCodeInfo;
|
| + if (source_code_info_ == NULL) {
|
| + source_code_info_ = new ::google::protobuf::SourceCodeInfo;
|
| + }
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.source_code_info)
|
| return source_code_info_;
|
| }
|
| inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::release_source_code_info() {
|
| @@ -3212,6 +3855,60 @@ inline void FileDescriptorProto::set_allocated_source_code_info(::google::protob
|
| } else {
|
| clear_has_source_code_info();
|
| }
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.source_code_info)
|
| +}
|
| +
|
| +// optional string syntax = 12;
|
| +inline bool FileDescriptorProto::has_syntax() const {
|
| + return (_has_bits_[0] & 0x00000800u) != 0;
|
| +}
|
| +inline void FileDescriptorProto::set_has_syntax() {
|
| + _has_bits_[0] |= 0x00000800u;
|
| +}
|
| +inline void FileDescriptorProto::clear_has_syntax() {
|
| + _has_bits_[0] &= ~0x00000800u;
|
| +}
|
| +inline void FileDescriptorProto::clear_syntax() {
|
| + syntax_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + clear_has_syntax();
|
| +}
|
| +inline const ::std::string& FileDescriptorProto::syntax() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.syntax)
|
| + return syntax_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline void FileDescriptorProto::set_syntax(const ::std::string& value) {
|
| + set_has_syntax();
|
| + syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.syntax)
|
| +}
|
| +inline void FileDescriptorProto::set_syntax(const char* value) {
|
| + set_has_syntax();
|
| + syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.syntax)
|
| +}
|
| +inline void FileDescriptorProto::set_syntax(const char* value, size_t size) {
|
| + set_has_syntax();
|
| + syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.syntax)
|
| +}
|
| +inline ::std::string* FileDescriptorProto::mutable_syntax() {
|
| + set_has_syntax();
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.syntax)
|
| + return syntax_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline ::std::string* FileDescriptorProto::release_syntax() {
|
| + clear_has_syntax();
|
| + return syntax_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline void FileDescriptorProto::set_allocated_syntax(::std::string* syntax) {
|
| + if (syntax != NULL) {
|
| + set_has_syntax();
|
| + } else {
|
| + clear_has_syntax();
|
| + }
|
| + syntax_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), syntax);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.syntax)
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -3233,11 +3930,13 @@ inline void DescriptorProto_ExtensionRange::clear_start() {
|
| clear_has_start();
|
| }
|
| inline ::google::protobuf::int32 DescriptorProto_ExtensionRange::start() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.start)
|
| return start_;
|
| }
|
| inline void DescriptorProto_ExtensionRange::set_start(::google::protobuf::int32 value) {
|
| set_has_start();
|
| start_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.start)
|
| }
|
|
|
| // optional int32 end = 2;
|
| @@ -3255,85 +3954,122 @@ inline void DescriptorProto_ExtensionRange::clear_end() {
|
| clear_has_end();
|
| }
|
| inline ::google::protobuf::int32 DescriptorProto_ExtensionRange::end() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.end)
|
| return end_;
|
| }
|
| inline void DescriptorProto_ExtensionRange::set_end(::google::protobuf::int32 value) {
|
| set_has_end();
|
| end_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.end)
|
| }
|
|
|
| // -------------------------------------------------------------------
|
|
|
| -// DescriptorProto
|
| +// DescriptorProto_ReservedRange
|
|
|
| -// optional string name = 1;
|
| -inline bool DescriptorProto::has_name() const {
|
| +// optional int32 start = 1;
|
| +inline bool DescriptorProto_ReservedRange::has_start() const {
|
| return (_has_bits_[0] & 0x00000001u) != 0;
|
| }
|
| -inline void DescriptorProto::set_has_name() {
|
| +inline void DescriptorProto_ReservedRange::set_has_start() {
|
| _has_bits_[0] |= 0x00000001u;
|
| }
|
| -inline void DescriptorProto::clear_has_name() {
|
| +inline void DescriptorProto_ReservedRange::clear_has_start() {
|
| _has_bits_[0] &= ~0x00000001u;
|
| }
|
| -inline void DescriptorProto::clear_name() {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - name_->clear();
|
| - }
|
| - clear_has_name();
|
| +inline void DescriptorProto_ReservedRange::clear_start() {
|
| + start_ = 0;
|
| + clear_has_start();
|
| }
|
| -inline const ::std::string& DescriptorProto::name() const {
|
| - return *name_;
|
| +inline ::google::protobuf::int32 DescriptorProto_ReservedRange::start() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.start)
|
| + return start_;
|
| }
|
| -inline void DescriptorProto::set_name(const ::std::string& value) {
|
| - set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| +inline void DescriptorProto_ReservedRange::set_start(::google::protobuf::int32 value) {
|
| + set_has_start();
|
| + start_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.start)
|
| }
|
| -inline void DescriptorProto::set_name(const char* value) {
|
| - set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| +
|
| +// optional int32 end = 2;
|
| +inline bool DescriptorProto_ReservedRange::has_end() const {
|
| + return (_has_bits_[0] & 0x00000002u) != 0;
|
| +}
|
| +inline void DescriptorProto_ReservedRange::set_has_end() {
|
| + _has_bits_[0] |= 0x00000002u;
|
| +}
|
| +inline void DescriptorProto_ReservedRange::clear_has_end() {
|
| + _has_bits_[0] &= ~0x00000002u;
|
| +}
|
| +inline void DescriptorProto_ReservedRange::clear_end() {
|
| + end_ = 0;
|
| + clear_has_end();
|
| +}
|
| +inline ::google::protobuf::int32 DescriptorProto_ReservedRange::end() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.end)
|
| + return end_;
|
| +}
|
| +inline void DescriptorProto_ReservedRange::set_end(::google::protobuf::int32 value) {
|
| + set_has_end();
|
| + end_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.end)
|
| +}
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// DescriptorProto
|
| +
|
| +// optional string name = 1;
|
| +inline bool DescriptorProto::has_name() const {
|
| + return (_has_bits_[0] & 0x00000001u) != 0;
|
| +}
|
| +inline void DescriptorProto::set_has_name() {
|
| + _has_bits_[0] |= 0x00000001u;
|
| +}
|
| +inline void DescriptorProto::clear_has_name() {
|
| + _has_bits_[0] &= ~0x00000001u;
|
| +}
|
| +inline void DescriptorProto::clear_name() {
|
| + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + clear_has_name();
|
| +}
|
| +inline const ::std::string& DescriptorProto::name() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.name)
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline void DescriptorProto::set_name(const ::std::string& value) {
|
| + set_has_name();
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.name)
|
| +}
|
| +inline void DescriptorProto::set_name(const char* value) {
|
| + set_has_name();
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.DescriptorProto.name)
|
| }
|
| inline void DescriptorProto::set_name(const char* value, size_t size) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(reinterpret_cast<const char*>(value), size);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.DescriptorProto.name)
|
| }
|
| inline ::std::string* DescriptorProto::mutable_name() {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - return name_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.name)
|
| + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* DescriptorProto::release_name() {
|
| clear_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = name_;
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void DescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete name_;
|
| - }
|
| - if (name) {
|
| + if (name != NULL) {
|
| set_has_name();
|
| - name_ = name;
|
| } else {
|
| clear_has_name();
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.DescriptorProto.name)
|
| }
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto field = 2;
|
| @@ -3344,22 +4080,27 @@ inline void DescriptorProto::clear_field() {
|
| field_.Clear();
|
| }
|
| inline const ::google::protobuf::FieldDescriptorProto& DescriptorProto::field(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.field)
|
| return field_.Get(index);
|
| }
|
| inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::mutable_field(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.field)
|
| return field_.Mutable(index);
|
| }
|
| inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::add_field() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.field)
|
| return field_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| -DescriptorProto::field() const {
|
| - return field_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| DescriptorProto::mutable_field() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.field)
|
| return &field_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| +DescriptorProto::field() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.field)
|
| + return field_;
|
| +}
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 6;
|
| inline int DescriptorProto::extension_size() const {
|
| @@ -3369,22 +4110,27 @@ inline void DescriptorProto::clear_extension() {
|
| extension_.Clear();
|
| }
|
| inline const ::google::protobuf::FieldDescriptorProto& DescriptorProto::extension(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.extension)
|
| return extension_.Get(index);
|
| }
|
| inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::mutable_extension(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.extension)
|
| return extension_.Mutable(index);
|
| }
|
| inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::add_extension() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.extension)
|
| return extension_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| -DescriptorProto::extension() const {
|
| - return extension_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| DescriptorProto::mutable_extension() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.extension)
|
| return &extension_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| +DescriptorProto::extension() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.extension)
|
| + return extension_;
|
| +}
|
|
|
| // repeated .google.protobuf.DescriptorProto nested_type = 3;
|
| inline int DescriptorProto::nested_type_size() const {
|
| @@ -3394,22 +4140,27 @@ inline void DescriptorProto::clear_nested_type() {
|
| nested_type_.Clear();
|
| }
|
| inline const ::google::protobuf::DescriptorProto& DescriptorProto::nested_type(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.nested_type)
|
| return nested_type_.Get(index);
|
| }
|
| inline ::google::protobuf::DescriptorProto* DescriptorProto::mutable_nested_type(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.nested_type)
|
| return nested_type_.Mutable(index);
|
| }
|
| inline ::google::protobuf::DescriptorProto* DescriptorProto::add_nested_type() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.nested_type)
|
| return nested_type_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >&
|
| -DescriptorProto::nested_type() const {
|
| - return nested_type_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >*
|
| DescriptorProto::mutable_nested_type() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.nested_type)
|
| return &nested_type_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >&
|
| +DescriptorProto::nested_type() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.nested_type)
|
| + return nested_type_;
|
| +}
|
|
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
|
| inline int DescriptorProto::enum_type_size() const {
|
| @@ -3419,22 +4170,27 @@ inline void DescriptorProto::clear_enum_type() {
|
| enum_type_.Clear();
|
| }
|
| inline const ::google::protobuf::EnumDescriptorProto& DescriptorProto::enum_type(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.enum_type)
|
| return enum_type_.Get(index);
|
| }
|
| inline ::google::protobuf::EnumDescriptorProto* DescriptorProto::mutable_enum_type(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.enum_type)
|
| return enum_type_.Mutable(index);
|
| }
|
| inline ::google::protobuf::EnumDescriptorProto* DescriptorProto::add_enum_type() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.enum_type)
|
| return enum_type_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >&
|
| -DescriptorProto::enum_type() const {
|
| - return enum_type_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >*
|
| DescriptorProto::mutable_enum_type() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.enum_type)
|
| return &enum_type_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >&
|
| +DescriptorProto::enum_type() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.enum_type)
|
| + return enum_type_;
|
| +}
|
|
|
| // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
|
| inline int DescriptorProto::extension_range_size() const {
|
| @@ -3444,43 +4200,82 @@ inline void DescriptorProto::clear_extension_range() {
|
| extension_range_.Clear();
|
| }
|
| inline const ::google::protobuf::DescriptorProto_ExtensionRange& DescriptorProto::extension_range(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.extension_range)
|
| return extension_range_.Get(index);
|
| }
|
| inline ::google::protobuf::DescriptorProto_ExtensionRange* DescriptorProto::mutable_extension_range(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.extension_range)
|
| return extension_range_.Mutable(index);
|
| }
|
| inline ::google::protobuf::DescriptorProto_ExtensionRange* DescriptorProto::add_extension_range() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.extension_range)
|
| return extension_range_.Add();
|
| }
|
| +inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange >*
|
| +DescriptorProto::mutable_extension_range() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.extension_range)
|
| + return &extension_range_;
|
| +}
|
| inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange >&
|
| DescriptorProto::extension_range() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.extension_range)
|
| return extension_range_;
|
| }
|
| -inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange >*
|
| -DescriptorProto::mutable_extension_range() {
|
| - return &extension_range_;
|
| +
|
| +// repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
|
| +inline int DescriptorProto::oneof_decl_size() const {
|
| + return oneof_decl_.size();
|
| +}
|
| +inline void DescriptorProto::clear_oneof_decl() {
|
| + oneof_decl_.Clear();
|
| +}
|
| +inline const ::google::protobuf::OneofDescriptorProto& DescriptorProto::oneof_decl(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.oneof_decl)
|
| + return oneof_decl_.Get(index);
|
| +}
|
| +inline ::google::protobuf::OneofDescriptorProto* DescriptorProto::mutable_oneof_decl(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.oneof_decl)
|
| + return oneof_decl_.Mutable(index);
|
| +}
|
| +inline ::google::protobuf::OneofDescriptorProto* DescriptorProto::add_oneof_decl() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.oneof_decl)
|
| + return oneof_decl_.Add();
|
| +}
|
| +inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::OneofDescriptorProto >*
|
| +DescriptorProto::mutable_oneof_decl() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.oneof_decl)
|
| + return &oneof_decl_;
|
| +}
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::OneofDescriptorProto >&
|
| +DescriptorProto::oneof_decl() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.oneof_decl)
|
| + return oneof_decl_;
|
| }
|
|
|
| // optional .google.protobuf.MessageOptions options = 7;
|
| inline bool DescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000040u) != 0;
|
| + return (_has_bits_[0] & 0x00000080u) != 0;
|
| }
|
| inline void DescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000040u;
|
| + _has_bits_[0] |= 0x00000080u;
|
| }
|
| inline void DescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000040u;
|
| + _has_bits_[0] &= ~0x00000080u;
|
| }
|
| inline void DescriptorProto::clear_options() {
|
| if (options_ != NULL) options_->::google::protobuf::MessageOptions::Clear();
|
| clear_has_options();
|
| }
|
| inline const ::google::protobuf::MessageOptions& DescriptorProto::options() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.options)
|
| return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::MessageOptions* DescriptorProto::mutable_options() {
|
| set_has_options();
|
| - if (options_ == NULL) options_ = new ::google::protobuf::MessageOptions;
|
| + if (options_ == NULL) {
|
| + options_ = new ::google::protobuf::MessageOptions;
|
| + }
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.options)
|
| return options_;
|
| }
|
| inline ::google::protobuf::MessageOptions* DescriptorProto::release_options() {
|
| @@ -3497,6 +4292,91 @@ inline void DescriptorProto::set_allocated_options(::google::protobuf::MessageOp
|
| } else {
|
| clear_has_options();
|
| }
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.DescriptorProto.options)
|
| +}
|
| +
|
| +// repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
|
| +inline int DescriptorProto::reserved_range_size() const {
|
| + return reserved_range_.size();
|
| +}
|
| +inline void DescriptorProto::clear_reserved_range() {
|
| + reserved_range_.Clear();
|
| +}
|
| +inline const ::google::protobuf::DescriptorProto_ReservedRange& DescriptorProto::reserved_range(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.reserved_range)
|
| + return reserved_range_.Get(index);
|
| +}
|
| +inline ::google::protobuf::DescriptorProto_ReservedRange* DescriptorProto::mutable_reserved_range(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.reserved_range)
|
| + return reserved_range_.Mutable(index);
|
| +}
|
| +inline ::google::protobuf::DescriptorProto_ReservedRange* DescriptorProto::add_reserved_range() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_range)
|
| + return reserved_range_.Add();
|
| +}
|
| +inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ReservedRange >*
|
| +DescriptorProto::mutable_reserved_range() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.reserved_range)
|
| + return &reserved_range_;
|
| +}
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ReservedRange >&
|
| +DescriptorProto::reserved_range() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.reserved_range)
|
| + return reserved_range_;
|
| +}
|
| +
|
| +// repeated string reserved_name = 10;
|
| +inline int DescriptorProto::reserved_name_size() const {
|
| + return reserved_name_.size();
|
| +}
|
| +inline void DescriptorProto::clear_reserved_name() {
|
| + reserved_name_.Clear();
|
| +}
|
| +inline const ::std::string& DescriptorProto::reserved_name(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.reserved_name)
|
| + return reserved_name_.Get(index);
|
| +}
|
| +inline ::std::string* DescriptorProto::mutable_reserved_name(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.reserved_name)
|
| + return reserved_name_.Mutable(index);
|
| +}
|
| +inline void DescriptorProto::set_reserved_name(int index, const ::std::string& value) {
|
| + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.reserved_name)
|
| + reserved_name_.Mutable(index)->assign(value);
|
| +}
|
| +inline void DescriptorProto::set_reserved_name(int index, const char* value) {
|
| + reserved_name_.Mutable(index)->assign(value);
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.DescriptorProto.reserved_name)
|
| +}
|
| +inline void DescriptorProto::set_reserved_name(int index, const char* value, size_t size) {
|
| + reserved_name_.Mutable(index)->assign(
|
| + reinterpret_cast<const char*>(value), size);
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.DescriptorProto.reserved_name)
|
| +}
|
| +inline ::std::string* DescriptorProto::add_reserved_name() {
|
| + return reserved_name_.Add();
|
| +}
|
| +inline void DescriptorProto::add_reserved_name(const ::std::string& value) {
|
| + reserved_name_.Add()->assign(value);
|
| + // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_name)
|
| +}
|
| +inline void DescriptorProto::add_reserved_name(const char* value) {
|
| + reserved_name_.Add()->assign(value);
|
| + // @@protoc_insertion_point(field_add_char:google.protobuf.DescriptorProto.reserved_name)
|
| +}
|
| +inline void DescriptorProto::add_reserved_name(const char* value, size_t size) {
|
| + reserved_name_.Add()->assign(reinterpret_cast<const char*>(value), size);
|
| + // @@protoc_insertion_point(field_add_pointer:google.protobuf.DescriptorProto.reserved_name)
|
| +}
|
| +inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
|
| +DescriptorProto::reserved_name() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.reserved_name)
|
| + return reserved_name_;
|
| +}
|
| +inline ::google::protobuf::RepeatedPtrField< ::std::string>*
|
| +DescriptorProto::mutable_reserved_name() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.reserved_name)
|
| + return &reserved_name_;
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -3514,63 +4394,46 @@ inline void FieldDescriptorProto::clear_has_name() {
|
| _has_bits_[0] &= ~0x00000001u;
|
| }
|
| inline void FieldDescriptorProto::clear_name() {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - name_->clear();
|
| - }
|
| + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_name();
|
| }
|
| inline const ::std::string& FieldDescriptorProto::name() const {
|
| - return *name_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.name)
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.name)
|
| }
|
| inline void FieldDescriptorProto::set_name(const char* value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.name)
|
| }
|
| inline void FieldDescriptorProto::set_name(const char* value, size_t size) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(reinterpret_cast<const char*>(value), size);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.name)
|
| }
|
| inline ::std::string* FieldDescriptorProto::mutable_name() {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - return name_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.name)
|
| + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* FieldDescriptorProto::release_name() {
|
| clear_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = name_;
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete name_;
|
| - }
|
| - if (name) {
|
| + if (name != NULL) {
|
| set_has_name();
|
| - name_ = name;
|
| } else {
|
| clear_has_name();
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.name)
|
| }
|
|
|
| // optional int32 number = 3;
|
| @@ -3588,11 +4451,13 @@ inline void FieldDescriptorProto::clear_number() {
|
| clear_has_number();
|
| }
|
| inline ::google::protobuf::int32 FieldDescriptorProto::number() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.number)
|
| return number_;
|
| }
|
| inline void FieldDescriptorProto::set_number(::google::protobuf::int32 value) {
|
| set_has_number();
|
| number_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.number)
|
| }
|
|
|
| // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
|
| @@ -3610,12 +4475,14 @@ inline void FieldDescriptorProto::clear_label() {
|
| clear_has_label();
|
| }
|
| inline ::google::protobuf::FieldDescriptorProto_Label FieldDescriptorProto::label() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.label)
|
| return static_cast< ::google::protobuf::FieldDescriptorProto_Label >(label_);
|
| }
|
| inline void FieldDescriptorProto::set_label(::google::protobuf::FieldDescriptorProto_Label value) {
|
| assert(::google::protobuf::FieldDescriptorProto_Label_IsValid(value));
|
| set_has_label();
|
| label_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.label)
|
| }
|
|
|
| // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
|
| @@ -3633,12 +4500,14 @@ inline void FieldDescriptorProto::clear_type() {
|
| clear_has_type();
|
| }
|
| inline ::google::protobuf::FieldDescriptorProto_Type FieldDescriptorProto::type() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type)
|
| return static_cast< ::google::protobuf::FieldDescriptorProto_Type >(type_);
|
| }
|
| inline void FieldDescriptorProto::set_type(::google::protobuf::FieldDescriptorProto_Type value) {
|
| assert(::google::protobuf::FieldDescriptorProto_Type_IsValid(value));
|
| set_has_type();
|
| type_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type)
|
| }
|
|
|
| // optional string type_name = 6;
|
| @@ -3652,63 +4521,46 @@ inline void FieldDescriptorProto::clear_has_type_name() {
|
| _has_bits_[0] &= ~0x00000010u;
|
| }
|
| inline void FieldDescriptorProto::clear_type_name() {
|
| - if (type_name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - type_name_->clear();
|
| - }
|
| + type_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_type_name();
|
| }
|
| inline const ::std::string& FieldDescriptorProto::type_name() const {
|
| - return *type_name_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type_name)
|
| + return type_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_type_name(const ::std::string& value) {
|
| set_has_type_name();
|
| - if (type_name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - type_name_ = new ::std::string;
|
| - }
|
| - type_name_->assign(value);
|
| + type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type_name)
|
| }
|
| inline void FieldDescriptorProto::set_type_name(const char* value) {
|
| set_has_type_name();
|
| - if (type_name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - type_name_ = new ::std::string;
|
| - }
|
| - type_name_->assign(value);
|
| + type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.type_name)
|
| }
|
| inline void FieldDescriptorProto::set_type_name(const char* value, size_t size) {
|
| set_has_type_name();
|
| - if (type_name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - type_name_ = new ::std::string;
|
| - }
|
| - type_name_->assign(reinterpret_cast<const char*>(value), size);
|
| + type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.type_name)
|
| }
|
| inline ::std::string* FieldDescriptorProto::mutable_type_name() {
|
| set_has_type_name();
|
| - if (type_name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - type_name_ = new ::std::string;
|
| - }
|
| - return type_name_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.type_name)
|
| + return type_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* FieldDescriptorProto::release_type_name() {
|
| clear_has_type_name();
|
| - if (type_name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = type_name_;
|
| - type_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return type_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_allocated_type_name(::std::string* type_name) {
|
| - if (type_name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete type_name_;
|
| - }
|
| - if (type_name) {
|
| + if (type_name != NULL) {
|
| set_has_type_name();
|
| - type_name_ = type_name;
|
| } else {
|
| clear_has_type_name();
|
| - type_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + type_name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), type_name);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.type_name)
|
| }
|
|
|
| // optional string extendee = 2;
|
| @@ -3722,63 +4574,46 @@ inline void FieldDescriptorProto::clear_has_extendee() {
|
| _has_bits_[0] &= ~0x00000020u;
|
| }
|
| inline void FieldDescriptorProto::clear_extendee() {
|
| - if (extendee_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - extendee_->clear();
|
| - }
|
| + extendee_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_extendee();
|
| }
|
| inline const ::std::string& FieldDescriptorProto::extendee() const {
|
| - return *extendee_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.extendee)
|
| + return extendee_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_extendee(const ::std::string& value) {
|
| set_has_extendee();
|
| - if (extendee_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - extendee_ = new ::std::string;
|
| - }
|
| - extendee_->assign(value);
|
| + extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.extendee)
|
| }
|
| inline void FieldDescriptorProto::set_extendee(const char* value) {
|
| set_has_extendee();
|
| - if (extendee_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - extendee_ = new ::std::string;
|
| - }
|
| - extendee_->assign(value);
|
| + extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.extendee)
|
| }
|
| inline void FieldDescriptorProto::set_extendee(const char* value, size_t size) {
|
| set_has_extendee();
|
| - if (extendee_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - extendee_ = new ::std::string;
|
| - }
|
| - extendee_->assign(reinterpret_cast<const char*>(value), size);
|
| + extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.extendee)
|
| }
|
| inline ::std::string* FieldDescriptorProto::mutable_extendee() {
|
| set_has_extendee();
|
| - if (extendee_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - extendee_ = new ::std::string;
|
| - }
|
| - return extendee_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.extendee)
|
| + return extendee_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* FieldDescriptorProto::release_extendee() {
|
| clear_has_extendee();
|
| - if (extendee_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = extendee_;
|
| - extendee_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return extendee_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_allocated_extendee(::std::string* extendee) {
|
| - if (extendee_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete extendee_;
|
| - }
|
| - if (extendee) {
|
| + if (extendee != NULL) {
|
| set_has_extendee();
|
| - extendee_ = extendee;
|
| } else {
|
| clear_has_extendee();
|
| - extendee_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + extendee_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), extendee);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.extendee)
|
| }
|
|
|
| // optional string default_value = 7;
|
| @@ -3792,85 +4627,149 @@ inline void FieldDescriptorProto::clear_has_default_value() {
|
| _has_bits_[0] &= ~0x00000040u;
|
| }
|
| inline void FieldDescriptorProto::clear_default_value() {
|
| - if (default_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - default_value_->clear();
|
| - }
|
| + default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_default_value();
|
| }
|
| inline const ::std::string& FieldDescriptorProto::default_value() const {
|
| - return *default_value_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.default_value)
|
| + return default_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_default_value(const ::std::string& value) {
|
| set_has_default_value();
|
| - if (default_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - default_value_ = new ::std::string;
|
| - }
|
| - default_value_->assign(value);
|
| + default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.default_value)
|
| }
|
| inline void FieldDescriptorProto::set_default_value(const char* value) {
|
| set_has_default_value();
|
| - if (default_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - default_value_ = new ::std::string;
|
| - }
|
| - default_value_->assign(value);
|
| + default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.default_value)
|
| }
|
| inline void FieldDescriptorProto::set_default_value(const char* value, size_t size) {
|
| set_has_default_value();
|
| - if (default_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - default_value_ = new ::std::string;
|
| - }
|
| - default_value_->assign(reinterpret_cast<const char*>(value), size);
|
| + default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.default_value)
|
| }
|
| inline ::std::string* FieldDescriptorProto::mutable_default_value() {
|
| set_has_default_value();
|
| - if (default_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - default_value_ = new ::std::string;
|
| - }
|
| - return default_value_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.default_value)
|
| + return default_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* FieldDescriptorProto::release_default_value() {
|
| clear_has_default_value();
|
| - if (default_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = default_value_;
|
| - default_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return default_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_allocated_default_value(::std::string* default_value) {
|
| - if (default_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete default_value_;
|
| - }
|
| - if (default_value) {
|
| + if (default_value != NULL) {
|
| set_has_default_value();
|
| - default_value_ = default_value;
|
| } else {
|
| clear_has_default_value();
|
| - default_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + default_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), default_value);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.default_value)
|
| +}
|
| +
|
| +// optional int32 oneof_index = 9;
|
| +inline bool FieldDescriptorProto::has_oneof_index() const {
|
| + return (_has_bits_[0] & 0x00000080u) != 0;
|
| +}
|
| +inline void FieldDescriptorProto::set_has_oneof_index() {
|
| + _has_bits_[0] |= 0x00000080u;
|
| +}
|
| +inline void FieldDescriptorProto::clear_has_oneof_index() {
|
| + _has_bits_[0] &= ~0x00000080u;
|
| +}
|
| +inline void FieldDescriptorProto::clear_oneof_index() {
|
| + oneof_index_ = 0;
|
| + clear_has_oneof_index();
|
| +}
|
| +inline ::google::protobuf::int32 FieldDescriptorProto::oneof_index() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.oneof_index)
|
| + return oneof_index_;
|
| +}
|
| +inline void FieldDescriptorProto::set_oneof_index(::google::protobuf::int32 value) {
|
| + set_has_oneof_index();
|
| + oneof_index_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.oneof_index)
|
| +}
|
| +
|
| +// optional string json_name = 10;
|
| +inline bool FieldDescriptorProto::has_json_name() const {
|
| + return (_has_bits_[0] & 0x00000100u) != 0;
|
| +}
|
| +inline void FieldDescriptorProto::set_has_json_name() {
|
| + _has_bits_[0] |= 0x00000100u;
|
| +}
|
| +inline void FieldDescriptorProto::clear_has_json_name() {
|
| + _has_bits_[0] &= ~0x00000100u;
|
| +}
|
| +inline void FieldDescriptorProto::clear_json_name() {
|
| + json_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + clear_has_json_name();
|
| +}
|
| +inline const ::std::string& FieldDescriptorProto::json_name() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.json_name)
|
| + return json_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline void FieldDescriptorProto::set_json_name(const ::std::string& value) {
|
| + set_has_json_name();
|
| + json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.json_name)
|
| +}
|
| +inline void FieldDescriptorProto::set_json_name(const char* value) {
|
| + set_has_json_name();
|
| + json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.json_name)
|
| +}
|
| +inline void FieldDescriptorProto::set_json_name(const char* value, size_t size) {
|
| + set_has_json_name();
|
| + json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.json_name)
|
| +}
|
| +inline ::std::string* FieldDescriptorProto::mutable_json_name() {
|
| + set_has_json_name();
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.json_name)
|
| + return json_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline ::std::string* FieldDescriptorProto::release_json_name() {
|
| + clear_has_json_name();
|
| + return json_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline void FieldDescriptorProto::set_allocated_json_name(::std::string* json_name) {
|
| + if (json_name != NULL) {
|
| + set_has_json_name();
|
| + } else {
|
| + clear_has_json_name();
|
| + }
|
| + json_name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), json_name);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.json_name)
|
| }
|
|
|
| // optional .google.protobuf.FieldOptions options = 8;
|
| inline bool FieldDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000080u) != 0;
|
| + return (_has_bits_[0] & 0x00000200u) != 0;
|
| }
|
| inline void FieldDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000080u;
|
| + _has_bits_[0] |= 0x00000200u;
|
| }
|
| inline void FieldDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000080u;
|
| + _has_bits_[0] &= ~0x00000200u;
|
| }
|
| inline void FieldDescriptorProto::clear_options() {
|
| if (options_ != NULL) options_->::google::protobuf::FieldOptions::Clear();
|
| clear_has_options();
|
| }
|
| inline const ::google::protobuf::FieldOptions& FieldDescriptorProto::options() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.options)
|
| return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::FieldOptions* FieldDescriptorProto::mutable_options() {
|
| set_has_options();
|
| - if (options_ == NULL) options_ = new ::google::protobuf::FieldOptions;
|
| + if (options_ == NULL) {
|
| + options_ = new ::google::protobuf::FieldOptions;
|
| + }
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.options)
|
| return options_;
|
| }
|
| inline ::google::protobuf::FieldOptions* FieldDescriptorProto::release_options() {
|
| @@ -3887,6 +4786,64 @@ inline void FieldDescriptorProto::set_allocated_options(::google::protobuf::Fiel
|
| } else {
|
| clear_has_options();
|
| }
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.options)
|
| +}
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// OneofDescriptorProto
|
| +
|
| +// optional string name = 1;
|
| +inline bool OneofDescriptorProto::has_name() const {
|
| + return (_has_bits_[0] & 0x00000001u) != 0;
|
| +}
|
| +inline void OneofDescriptorProto::set_has_name() {
|
| + _has_bits_[0] |= 0x00000001u;
|
| +}
|
| +inline void OneofDescriptorProto::clear_has_name() {
|
| + _has_bits_[0] &= ~0x00000001u;
|
| +}
|
| +inline void OneofDescriptorProto::clear_name() {
|
| + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + clear_has_name();
|
| +}
|
| +inline const ::std::string& OneofDescriptorProto::name() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.name)
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline void OneofDescriptorProto::set_name(const ::std::string& value) {
|
| + set_has_name();
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.OneofDescriptorProto.name)
|
| +}
|
| +inline void OneofDescriptorProto::set_name(const char* value) {
|
| + set_has_name();
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.OneofDescriptorProto.name)
|
| +}
|
| +inline void OneofDescriptorProto::set_name(const char* value, size_t size) {
|
| + set_has_name();
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.OneofDescriptorProto.name)
|
| +}
|
| +inline ::std::string* OneofDescriptorProto::mutable_name() {
|
| + set_has_name();
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.OneofDescriptorProto.name)
|
| + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline ::std::string* OneofDescriptorProto::release_name() {
|
| + clear_has_name();
|
| + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline void OneofDescriptorProto::set_allocated_name(::std::string* name) {
|
| + if (name != NULL) {
|
| + set_has_name();
|
| + } else {
|
| + clear_has_name();
|
| + }
|
| + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.name)
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -3904,63 +4861,46 @@ inline void EnumDescriptorProto::clear_has_name() {
|
| _has_bits_[0] &= ~0x00000001u;
|
| }
|
| inline void EnumDescriptorProto::clear_name() {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - name_->clear();
|
| - }
|
| + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_name();
|
| }
|
| inline const ::std::string& EnumDescriptorProto::name() const {
|
| - return *name_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.name)
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void EnumDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.name)
|
| }
|
| inline void EnumDescriptorProto::set_name(const char* value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.EnumDescriptorProto.name)
|
| }
|
| inline void EnumDescriptorProto::set_name(const char* value, size_t size) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(reinterpret_cast<const char*>(value), size);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.EnumDescriptorProto.name)
|
| }
|
| inline ::std::string* EnumDescriptorProto::mutable_name() {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - return name_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.name)
|
| + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* EnumDescriptorProto::release_name() {
|
| clear_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = name_;
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void EnumDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete name_;
|
| - }
|
| - if (name) {
|
| + if (name != NULL) {
|
| set_has_name();
|
| - name_ = name;
|
| } else {
|
| clear_has_name();
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumDescriptorProto.name)
|
| }
|
|
|
| // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
|
| @@ -3971,22 +4911,27 @@ inline void EnumDescriptorProto::clear_value() {
|
| value_.Clear();
|
| }
|
| inline const ::google::protobuf::EnumValueDescriptorProto& EnumDescriptorProto::value(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.value)
|
| return value_.Get(index);
|
| }
|
| inline ::google::protobuf::EnumValueDescriptorProto* EnumDescriptorProto::mutable_value(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.value)
|
| return value_.Mutable(index);
|
| }
|
| inline ::google::protobuf::EnumValueDescriptorProto* EnumDescriptorProto::add_value() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.value)
|
| return value_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto >&
|
| -EnumDescriptorProto::value() const {
|
| - return value_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto >*
|
| EnumDescriptorProto::mutable_value() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumDescriptorProto.value)
|
| return &value_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto >&
|
| +EnumDescriptorProto::value() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.EnumDescriptorProto.value)
|
| + return value_;
|
| +}
|
|
|
| // optional .google.protobuf.EnumOptions options = 3;
|
| inline bool EnumDescriptorProto::has_options() const {
|
| @@ -4003,11 +4948,15 @@ inline void EnumDescriptorProto::clear_options() {
|
| clear_has_options();
|
| }
|
| inline const ::google::protobuf::EnumOptions& EnumDescriptorProto::options() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.options)
|
| return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::EnumOptions* EnumDescriptorProto::mutable_options() {
|
| set_has_options();
|
| - if (options_ == NULL) options_ = new ::google::protobuf::EnumOptions;
|
| + if (options_ == NULL) {
|
| + options_ = new ::google::protobuf::EnumOptions;
|
| + }
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.options)
|
| return options_;
|
| }
|
| inline ::google::protobuf::EnumOptions* EnumDescriptorProto::release_options() {
|
| @@ -4024,6 +4973,7 @@ inline void EnumDescriptorProto::set_allocated_options(::google::protobuf::EnumO
|
| } else {
|
| clear_has_options();
|
| }
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumDescriptorProto.options)
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -4041,63 +4991,46 @@ inline void EnumValueDescriptorProto::clear_has_name() {
|
| _has_bits_[0] &= ~0x00000001u;
|
| }
|
| inline void EnumValueDescriptorProto::clear_name() {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - name_->clear();
|
| - }
|
| + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_name();
|
| }
|
| inline const ::std::string& EnumValueDescriptorProto::name() const {
|
| - return *name_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.name)
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void EnumValueDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.name)
|
| }
|
| inline void EnumValueDescriptorProto::set_name(const char* value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.EnumValueDescriptorProto.name)
|
| }
|
| inline void EnumValueDescriptorProto::set_name(const char* value, size_t size) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(reinterpret_cast<const char*>(value), size);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.EnumValueDescriptorProto.name)
|
| }
|
| inline ::std::string* EnumValueDescriptorProto::mutable_name() {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - return name_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueDescriptorProto.name)
|
| + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* EnumValueDescriptorProto::release_name() {
|
| clear_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = name_;
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void EnumValueDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete name_;
|
| - }
|
| - if (name) {
|
| + if (name != NULL) {
|
| set_has_name();
|
| - name_ = name;
|
| } else {
|
| clear_has_name();
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValueDescriptorProto.name)
|
| }
|
|
|
| // optional int32 number = 2;
|
| @@ -4115,11 +5048,13 @@ inline void EnumValueDescriptorProto::clear_number() {
|
| clear_has_number();
|
| }
|
| inline ::google::protobuf::int32 EnumValueDescriptorProto::number() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.number)
|
| return number_;
|
| }
|
| inline void EnumValueDescriptorProto::set_number(::google::protobuf::int32 value) {
|
| set_has_number();
|
| number_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.number)
|
| }
|
|
|
| // optional .google.protobuf.EnumValueOptions options = 3;
|
| @@ -4137,11 +5072,15 @@ inline void EnumValueDescriptorProto::clear_options() {
|
| clear_has_options();
|
| }
|
| inline const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::options() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.options)
|
| return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::mutable_options() {
|
| set_has_options();
|
| - if (options_ == NULL) options_ = new ::google::protobuf::EnumValueOptions;
|
| + if (options_ == NULL) {
|
| + options_ = new ::google::protobuf::EnumValueOptions;
|
| + }
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueDescriptorProto.options)
|
| return options_;
|
| }
|
| inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::release_options() {
|
| @@ -4158,6 +5097,7 @@ inline void EnumValueDescriptorProto::set_allocated_options(::google::protobuf::
|
| } else {
|
| clear_has_options();
|
| }
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValueDescriptorProto.options)
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -4175,63 +5115,46 @@ inline void ServiceDescriptorProto::clear_has_name() {
|
| _has_bits_[0] &= ~0x00000001u;
|
| }
|
| inline void ServiceDescriptorProto::clear_name() {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - name_->clear();
|
| - }
|
| + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_name();
|
| }
|
| inline const ::std::string& ServiceDescriptorProto::name() const {
|
| - return *name_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.name)
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void ServiceDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.ServiceDescriptorProto.name)
|
| }
|
| inline void ServiceDescriptorProto::set_name(const char* value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.ServiceDescriptorProto.name)
|
| }
|
| inline void ServiceDescriptorProto::set_name(const char* value, size_t size) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(reinterpret_cast<const char*>(value), size);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.ServiceDescriptorProto.name)
|
| }
|
| inline ::std::string* ServiceDescriptorProto::mutable_name() {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - return name_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.name)
|
| + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* ServiceDescriptorProto::release_name() {
|
| clear_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = name_;
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void ServiceDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete name_;
|
| - }
|
| - if (name) {
|
| + if (name != NULL) {
|
| set_has_name();
|
| - name_ = name;
|
| } else {
|
| clear_has_name();
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.ServiceDescriptorProto.name)
|
| }
|
|
|
| // repeated .google.protobuf.MethodDescriptorProto method = 2;
|
| @@ -4242,23 +5165,28 @@ inline void ServiceDescriptorProto::clear_method() {
|
| method_.Clear();
|
| }
|
| inline const ::google::protobuf::MethodDescriptorProto& ServiceDescriptorProto::method(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.method)
|
| return method_.Get(index);
|
| }
|
| inline ::google::protobuf::MethodDescriptorProto* ServiceDescriptorProto::mutable_method(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.method)
|
| return method_.Mutable(index);
|
| }
|
| inline ::google::protobuf::MethodDescriptorProto* ServiceDescriptorProto::add_method() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.ServiceDescriptorProto.method)
|
| return method_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto >&
|
| -ServiceDescriptorProto::method() const {
|
| - return method_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto >*
|
| ServiceDescriptorProto::mutable_method() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceDescriptorProto.method)
|
| return &method_;
|
| }
|
| -
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto >&
|
| +ServiceDescriptorProto::method() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.ServiceDescriptorProto.method)
|
| + return method_;
|
| +}
|
| +
|
| // optional .google.protobuf.ServiceOptions options = 3;
|
| inline bool ServiceDescriptorProto::has_options() const {
|
| return (_has_bits_[0] & 0x00000004u) != 0;
|
| @@ -4274,11 +5202,15 @@ inline void ServiceDescriptorProto::clear_options() {
|
| clear_has_options();
|
| }
|
| inline const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::options() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.options)
|
| return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::mutable_options() {
|
| set_has_options();
|
| - if (options_ == NULL) options_ = new ::google::protobuf::ServiceOptions;
|
| + if (options_ == NULL) {
|
| + options_ = new ::google::protobuf::ServiceOptions;
|
| + }
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.options)
|
| return options_;
|
| }
|
| inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::release_options() {
|
| @@ -4295,6 +5227,7 @@ inline void ServiceDescriptorProto::set_allocated_options(::google::protobuf::Se
|
| } else {
|
| clear_has_options();
|
| }
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.ServiceDescriptorProto.options)
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -4312,63 +5245,46 @@ inline void MethodDescriptorProto::clear_has_name() {
|
| _has_bits_[0] &= ~0x00000001u;
|
| }
|
| inline void MethodDescriptorProto::clear_name() {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - name_->clear();
|
| - }
|
| + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_name();
|
| }
|
| inline const ::std::string& MethodDescriptorProto::name() const {
|
| - return *name_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.name)
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void MethodDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.name)
|
| }
|
| inline void MethodDescriptorProto::set_name(const char* value) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(value);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.name)
|
| }
|
| inline void MethodDescriptorProto::set_name(const char* value, size_t size) {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - name_->assign(reinterpret_cast<const char*>(value), size);
|
| + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.name)
|
| }
|
| inline ::std::string* MethodDescriptorProto::mutable_name() {
|
| set_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_ = new ::std::string;
|
| - }
|
| - return name_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.name)
|
| + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* MethodDescriptorProto::release_name() {
|
| clear_has_name();
|
| - if (name_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = name_;
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void MethodDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete name_;
|
| - }
|
| - if (name) {
|
| + if (name != NULL) {
|
| set_has_name();
|
| - name_ = name;
|
| } else {
|
| clear_has_name();
|
| - name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.name)
|
| }
|
|
|
| // optional string input_type = 2;
|
| @@ -4382,63 +5298,46 @@ inline void MethodDescriptorProto::clear_has_input_type() {
|
| _has_bits_[0] &= ~0x00000002u;
|
| }
|
| inline void MethodDescriptorProto::clear_input_type() {
|
| - if (input_type_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - input_type_->clear();
|
| - }
|
| + input_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_input_type();
|
| }
|
| inline const ::std::string& MethodDescriptorProto::input_type() const {
|
| - return *input_type_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.input_type)
|
| + return input_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void MethodDescriptorProto::set_input_type(const ::std::string& value) {
|
| set_has_input_type();
|
| - if (input_type_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - input_type_ = new ::std::string;
|
| - }
|
| - input_type_->assign(value);
|
| + input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.input_type)
|
| }
|
| inline void MethodDescriptorProto::set_input_type(const char* value) {
|
| set_has_input_type();
|
| - if (input_type_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - input_type_ = new ::std::string;
|
| - }
|
| - input_type_->assign(value);
|
| + input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.input_type)
|
| }
|
| inline void MethodDescriptorProto::set_input_type(const char* value, size_t size) {
|
| set_has_input_type();
|
| - if (input_type_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - input_type_ = new ::std::string;
|
| - }
|
| - input_type_->assign(reinterpret_cast<const char*>(value), size);
|
| + input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.input_type)
|
| }
|
| inline ::std::string* MethodDescriptorProto::mutable_input_type() {
|
| set_has_input_type();
|
| - if (input_type_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - input_type_ = new ::std::string;
|
| - }
|
| - return input_type_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.input_type)
|
| + return input_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* MethodDescriptorProto::release_input_type() {
|
| clear_has_input_type();
|
| - if (input_type_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = input_type_;
|
| - input_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return input_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void MethodDescriptorProto::set_allocated_input_type(::std::string* input_type) {
|
| - if (input_type_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete input_type_;
|
| - }
|
| - if (input_type) {
|
| + if (input_type != NULL) {
|
| set_has_input_type();
|
| - input_type_ = input_type;
|
| } else {
|
| clear_has_input_type();
|
| - input_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + input_type_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), input_type);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.input_type)
|
| }
|
|
|
| // optional string output_type = 3;
|
| @@ -4452,63 +5351,46 @@ inline void MethodDescriptorProto::clear_has_output_type() {
|
| _has_bits_[0] &= ~0x00000004u;
|
| }
|
| inline void MethodDescriptorProto::clear_output_type() {
|
| - if (output_type_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - output_type_->clear();
|
| - }
|
| + output_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_output_type();
|
| }
|
| inline const ::std::string& MethodDescriptorProto::output_type() const {
|
| - return *output_type_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.output_type)
|
| + return output_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void MethodDescriptorProto::set_output_type(const ::std::string& value) {
|
| set_has_output_type();
|
| - if (output_type_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - output_type_ = new ::std::string;
|
| - }
|
| - output_type_->assign(value);
|
| + output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.output_type)
|
| }
|
| inline void MethodDescriptorProto::set_output_type(const char* value) {
|
| set_has_output_type();
|
| - if (output_type_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - output_type_ = new ::std::string;
|
| - }
|
| - output_type_->assign(value);
|
| + output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.output_type)
|
| }
|
| inline void MethodDescriptorProto::set_output_type(const char* value, size_t size) {
|
| set_has_output_type();
|
| - if (output_type_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - output_type_ = new ::std::string;
|
| - }
|
| - output_type_->assign(reinterpret_cast<const char*>(value), size);
|
| + output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.output_type)
|
| }
|
| inline ::std::string* MethodDescriptorProto::mutable_output_type() {
|
| set_has_output_type();
|
| - if (output_type_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - output_type_ = new ::std::string;
|
| - }
|
| - return output_type_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.output_type)
|
| + return output_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* MethodDescriptorProto::release_output_type() {
|
| clear_has_output_type();
|
| - if (output_type_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = output_type_;
|
| - output_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return output_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void MethodDescriptorProto::set_allocated_output_type(::std::string* output_type) {
|
| - if (output_type_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete output_type_;
|
| - }
|
| - if (output_type) {
|
| + if (output_type != NULL) {
|
| set_has_output_type();
|
| - output_type_ = output_type;
|
| } else {
|
| clear_has_output_type();
|
| - output_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + output_type_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), output_type);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.output_type)
|
| }
|
|
|
| // optional .google.protobuf.MethodOptions options = 4;
|
| @@ -4526,11 +5408,15 @@ inline void MethodDescriptorProto::clear_options() {
|
| clear_has_options();
|
| }
|
| inline const ::google::protobuf::MethodOptions& MethodDescriptorProto::options() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.options)
|
| return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::MethodOptions* MethodDescriptorProto::mutable_options() {
|
| set_has_options();
|
| - if (options_ == NULL) options_ = new ::google::protobuf::MethodOptions;
|
| + if (options_ == NULL) {
|
| + options_ = new ::google::protobuf::MethodOptions;
|
| + }
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.options)
|
| return options_;
|
| }
|
| inline ::google::protobuf::MethodOptions* MethodDescriptorProto::release_options() {
|
| @@ -4547,6 +5433,55 @@ inline void MethodDescriptorProto::set_allocated_options(::google::protobuf::Met
|
| } else {
|
| clear_has_options();
|
| }
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.options)
|
| +}
|
| +
|
| +// optional bool client_streaming = 5 [default = false];
|
| +inline bool MethodDescriptorProto::has_client_streaming() const {
|
| + return (_has_bits_[0] & 0x00000010u) != 0;
|
| +}
|
| +inline void MethodDescriptorProto::set_has_client_streaming() {
|
| + _has_bits_[0] |= 0x00000010u;
|
| +}
|
| +inline void MethodDescriptorProto::clear_has_client_streaming() {
|
| + _has_bits_[0] &= ~0x00000010u;
|
| +}
|
| +inline void MethodDescriptorProto::clear_client_streaming() {
|
| + client_streaming_ = false;
|
| + clear_has_client_streaming();
|
| +}
|
| +inline bool MethodDescriptorProto::client_streaming() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.client_streaming)
|
| + return client_streaming_;
|
| +}
|
| +inline void MethodDescriptorProto::set_client_streaming(bool value) {
|
| + set_has_client_streaming();
|
| + client_streaming_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.client_streaming)
|
| +}
|
| +
|
| +// optional bool server_streaming = 6 [default = false];
|
| +inline bool MethodDescriptorProto::has_server_streaming() const {
|
| + return (_has_bits_[0] & 0x00000020u) != 0;
|
| +}
|
| +inline void MethodDescriptorProto::set_has_server_streaming() {
|
| + _has_bits_[0] |= 0x00000020u;
|
| +}
|
| +inline void MethodDescriptorProto::clear_has_server_streaming() {
|
| + _has_bits_[0] &= ~0x00000020u;
|
| +}
|
| +inline void MethodDescriptorProto::clear_server_streaming() {
|
| + server_streaming_ = false;
|
| + clear_has_server_streaming();
|
| +}
|
| +inline bool MethodDescriptorProto::server_streaming() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.server_streaming)
|
| + return server_streaming_;
|
| +}
|
| +inline void MethodDescriptorProto::set_server_streaming(bool value) {
|
| + set_has_server_streaming();
|
| + server_streaming_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.server_streaming)
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -4564,63 +5499,46 @@ inline void FileOptions::clear_has_java_package() {
|
| _has_bits_[0] &= ~0x00000001u;
|
| }
|
| inline void FileOptions::clear_java_package() {
|
| - if (java_package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - java_package_->clear();
|
| - }
|
| + java_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_java_package();
|
| }
|
| inline const ::std::string& FileOptions::java_package() const {
|
| - return *java_package_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_package)
|
| + return java_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileOptions::set_java_package(const ::std::string& value) {
|
| set_has_java_package();
|
| - if (java_package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - java_package_ = new ::std::string;
|
| - }
|
| - java_package_->assign(value);
|
| + java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_package)
|
| }
|
| inline void FileOptions::set_java_package(const char* value) {
|
| set_has_java_package();
|
| - if (java_package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - java_package_ = new ::std::string;
|
| - }
|
| - java_package_->assign(value);
|
| + java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.java_package)
|
| }
|
| inline void FileOptions::set_java_package(const char* value, size_t size) {
|
| set_has_java_package();
|
| - if (java_package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - java_package_ = new ::std::string;
|
| - }
|
| - java_package_->assign(reinterpret_cast<const char*>(value), size);
|
| + java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.java_package)
|
| }
|
| inline ::std::string* FileOptions::mutable_java_package() {
|
| set_has_java_package();
|
| - if (java_package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - java_package_ = new ::std::string;
|
| - }
|
| - return java_package_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.java_package)
|
| + return java_package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* FileOptions::release_java_package() {
|
| clear_has_java_package();
|
| - if (java_package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = java_package_;
|
| - java_package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return java_package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileOptions::set_allocated_java_package(::std::string* java_package) {
|
| - if (java_package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete java_package_;
|
| - }
|
| - if (java_package) {
|
| + if (java_package != NULL) {
|
| set_has_java_package();
|
| - java_package_ = java_package;
|
| } else {
|
| clear_has_java_package();
|
| - java_package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + java_package_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), java_package);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.java_package)
|
| }
|
|
|
| // optional string java_outer_classname = 8;
|
| @@ -4634,63 +5552,46 @@ inline void FileOptions::clear_has_java_outer_classname() {
|
| _has_bits_[0] &= ~0x00000002u;
|
| }
|
| inline void FileOptions::clear_java_outer_classname() {
|
| - if (java_outer_classname_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - java_outer_classname_->clear();
|
| - }
|
| + java_outer_classname_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_java_outer_classname();
|
| }
|
| inline const ::std::string& FileOptions::java_outer_classname() const {
|
| - return *java_outer_classname_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_outer_classname)
|
| + return java_outer_classname_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileOptions::set_java_outer_classname(const ::std::string& value) {
|
| set_has_java_outer_classname();
|
| - if (java_outer_classname_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - java_outer_classname_ = new ::std::string;
|
| - }
|
| - java_outer_classname_->assign(value);
|
| + java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_outer_classname)
|
| }
|
| inline void FileOptions::set_java_outer_classname(const char* value) {
|
| set_has_java_outer_classname();
|
| - if (java_outer_classname_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - java_outer_classname_ = new ::std::string;
|
| - }
|
| - java_outer_classname_->assign(value);
|
| + java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.java_outer_classname)
|
| }
|
| inline void FileOptions::set_java_outer_classname(const char* value, size_t size) {
|
| set_has_java_outer_classname();
|
| - if (java_outer_classname_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - java_outer_classname_ = new ::std::string;
|
| - }
|
| - java_outer_classname_->assign(reinterpret_cast<const char*>(value), size);
|
| + java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.java_outer_classname)
|
| }
|
| inline ::std::string* FileOptions::mutable_java_outer_classname() {
|
| set_has_java_outer_classname();
|
| - if (java_outer_classname_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - java_outer_classname_ = new ::std::string;
|
| - }
|
| - return java_outer_classname_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.java_outer_classname)
|
| + return java_outer_classname_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* FileOptions::release_java_outer_classname() {
|
| clear_has_java_outer_classname();
|
| - if (java_outer_classname_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = java_outer_classname_;
|
| - java_outer_classname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return java_outer_classname_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileOptions::set_allocated_java_outer_classname(::std::string* java_outer_classname) {
|
| - if (java_outer_classname_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete java_outer_classname_;
|
| - }
|
| - if (java_outer_classname) {
|
| + if (java_outer_classname != NULL) {
|
| set_has_java_outer_classname();
|
| - java_outer_classname_ = java_outer_classname;
|
| } else {
|
| clear_has_java_outer_classname();
|
| - java_outer_classname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + java_outer_classname_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), java_outer_classname);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.java_outer_classname)
|
| }
|
|
|
| // optional bool java_multiple_files = 10 [default = false];
|
| @@ -4708,55 +5609,61 @@ inline void FileOptions::clear_java_multiple_files() {
|
| clear_has_java_multiple_files();
|
| }
|
| inline bool FileOptions::java_multiple_files() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_multiple_files)
|
| return java_multiple_files_;
|
| }
|
| inline void FileOptions::set_java_multiple_files(bool value) {
|
| set_has_java_multiple_files();
|
| java_multiple_files_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_multiple_files)
|
| }
|
|
|
| -// optional bool retain_unknown_fields = 12 [default = false];
|
| -inline bool FileOptions::has_retain_unknown_fields() const {
|
| +// optional bool java_generate_equals_and_hash = 20 [default = false];
|
| +inline bool FileOptions::has_java_generate_equals_and_hash() const {
|
| return (_has_bits_[0] & 0x00000008u) != 0;
|
| }
|
| -inline void FileOptions::set_has_retain_unknown_fields() {
|
| +inline void FileOptions::set_has_java_generate_equals_and_hash() {
|
| _has_bits_[0] |= 0x00000008u;
|
| }
|
| -inline void FileOptions::clear_has_retain_unknown_fields() {
|
| +inline void FileOptions::clear_has_java_generate_equals_and_hash() {
|
| _has_bits_[0] &= ~0x00000008u;
|
| }
|
| -inline void FileOptions::clear_retain_unknown_fields() {
|
| - retain_unknown_fields_ = false;
|
| - clear_has_retain_unknown_fields();
|
| +inline void FileOptions::clear_java_generate_equals_and_hash() {
|
| + java_generate_equals_and_hash_ = false;
|
| + clear_has_java_generate_equals_and_hash();
|
| }
|
| -inline bool FileOptions::retain_unknown_fields() const {
|
| - return retain_unknown_fields_;
|
| +inline bool FileOptions::java_generate_equals_and_hash() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_generate_equals_and_hash)
|
| + return java_generate_equals_and_hash_;
|
| }
|
| -inline void FileOptions::set_retain_unknown_fields(bool value) {
|
| - set_has_retain_unknown_fields();
|
| - retain_unknown_fields_ = value;
|
| +inline void FileOptions::set_java_generate_equals_and_hash(bool value) {
|
| + set_has_java_generate_equals_and_hash();
|
| + java_generate_equals_and_hash_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generate_equals_and_hash)
|
| }
|
|
|
| -// optional bool java_generate_equals_and_hash = 20 [default = false];
|
| -inline bool FileOptions::has_java_generate_equals_and_hash() const {
|
| +// optional bool java_string_check_utf8 = 27 [default = false];
|
| +inline bool FileOptions::has_java_string_check_utf8() const {
|
| return (_has_bits_[0] & 0x00000010u) != 0;
|
| }
|
| -inline void FileOptions::set_has_java_generate_equals_and_hash() {
|
| +inline void FileOptions::set_has_java_string_check_utf8() {
|
| _has_bits_[0] |= 0x00000010u;
|
| }
|
| -inline void FileOptions::clear_has_java_generate_equals_and_hash() {
|
| +inline void FileOptions::clear_has_java_string_check_utf8() {
|
| _has_bits_[0] &= ~0x00000010u;
|
| }
|
| -inline void FileOptions::clear_java_generate_equals_and_hash() {
|
| - java_generate_equals_and_hash_ = false;
|
| - clear_has_java_generate_equals_and_hash();
|
| +inline void FileOptions::clear_java_string_check_utf8() {
|
| + java_string_check_utf8_ = false;
|
| + clear_has_java_string_check_utf8();
|
| }
|
| -inline bool FileOptions::java_generate_equals_and_hash() const {
|
| - return java_generate_equals_and_hash_;
|
| +inline bool FileOptions::java_string_check_utf8() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_string_check_utf8)
|
| + return java_string_check_utf8_;
|
| }
|
| -inline void FileOptions::set_java_generate_equals_and_hash(bool value) {
|
| - set_has_java_generate_equals_and_hash();
|
| - java_generate_equals_and_hash_ = value;
|
| +inline void FileOptions::set_java_string_check_utf8(bool value) {
|
| + set_has_java_string_check_utf8();
|
| + java_string_check_utf8_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_string_check_utf8)
|
| }
|
|
|
| // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
|
| @@ -4774,12 +5681,14 @@ inline void FileOptions::clear_optimize_for() {
|
| clear_has_optimize_for();
|
| }
|
| inline ::google::protobuf::FileOptions_OptimizeMode FileOptions::optimize_for() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.optimize_for)
|
| return static_cast< ::google::protobuf::FileOptions_OptimizeMode >(optimize_for_);
|
| }
|
| inline void FileOptions::set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value) {
|
| assert(::google::protobuf::FileOptions_OptimizeMode_IsValid(value));
|
| set_has_optimize_for();
|
| optimize_for_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.optimize_for)
|
| }
|
|
|
| // optional string go_package = 11;
|
| @@ -4793,63 +5702,46 @@ inline void FileOptions::clear_has_go_package() {
|
| _has_bits_[0] &= ~0x00000040u;
|
| }
|
| inline void FileOptions::clear_go_package() {
|
| - if (go_package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - go_package_->clear();
|
| - }
|
| + go_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_go_package();
|
| }
|
| inline const ::std::string& FileOptions::go_package() const {
|
| - return *go_package_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.go_package)
|
| + return go_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileOptions::set_go_package(const ::std::string& value) {
|
| set_has_go_package();
|
| - if (go_package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - go_package_ = new ::std::string;
|
| - }
|
| - go_package_->assign(value);
|
| + go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.go_package)
|
| }
|
| inline void FileOptions::set_go_package(const char* value) {
|
| set_has_go_package();
|
| - if (go_package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - go_package_ = new ::std::string;
|
| - }
|
| - go_package_->assign(value);
|
| + go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.go_package)
|
| }
|
| inline void FileOptions::set_go_package(const char* value, size_t size) {
|
| set_has_go_package();
|
| - if (go_package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - go_package_ = new ::std::string;
|
| - }
|
| - go_package_->assign(reinterpret_cast<const char*>(value), size);
|
| + go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.go_package)
|
| }
|
| inline ::std::string* FileOptions::mutable_go_package() {
|
| set_has_go_package();
|
| - if (go_package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - go_package_ = new ::std::string;
|
| - }
|
| - return go_package_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.go_package)
|
| + return go_package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* FileOptions::release_go_package() {
|
| clear_has_go_package();
|
| - if (go_package_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = go_package_;
|
| - go_package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return go_package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileOptions::set_allocated_go_package(::std::string* go_package) {
|
| - if (go_package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete go_package_;
|
| - }
|
| - if (go_package) {
|
| + if (go_package != NULL) {
|
| set_has_go_package();
|
| - go_package_ = go_package;
|
| } else {
|
| clear_has_go_package();
|
| - go_package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + go_package_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), go_package);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.go_package)
|
| }
|
|
|
| // optional bool cc_generic_services = 16 [default = false];
|
| @@ -4867,11 +5759,13 @@ inline void FileOptions::clear_cc_generic_services() {
|
| clear_has_cc_generic_services();
|
| }
|
| inline bool FileOptions::cc_generic_services() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.cc_generic_services)
|
| return cc_generic_services_;
|
| }
|
| inline void FileOptions::set_cc_generic_services(bool value) {
|
| set_has_cc_generic_services();
|
| cc_generic_services_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_generic_services)
|
| }
|
|
|
| // optional bool java_generic_services = 17 [default = false];
|
| @@ -4889,11 +5783,13 @@ inline void FileOptions::clear_java_generic_services() {
|
| clear_has_java_generic_services();
|
| }
|
| inline bool FileOptions::java_generic_services() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_generic_services)
|
| return java_generic_services_;
|
| }
|
| inline void FileOptions::set_java_generic_services(bool value) {
|
| set_has_java_generic_services();
|
| java_generic_services_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generic_services)
|
| }
|
|
|
| // optional bool py_generic_services = 18 [default = false];
|
| @@ -4911,11 +5807,191 @@ inline void FileOptions::clear_py_generic_services() {
|
| clear_has_py_generic_services();
|
| }
|
| inline bool FileOptions::py_generic_services() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.py_generic_services)
|
| return py_generic_services_;
|
| }
|
| inline void FileOptions::set_py_generic_services(bool value) {
|
| set_has_py_generic_services();
|
| py_generic_services_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.py_generic_services)
|
| +}
|
| +
|
| +// optional bool deprecated = 23 [default = false];
|
| +inline bool FileOptions::has_deprecated() const {
|
| + return (_has_bits_[0] & 0x00000400u) != 0;
|
| +}
|
| +inline void FileOptions::set_has_deprecated() {
|
| + _has_bits_[0] |= 0x00000400u;
|
| +}
|
| +inline void FileOptions::clear_has_deprecated() {
|
| + _has_bits_[0] &= ~0x00000400u;
|
| +}
|
| +inline void FileOptions::clear_deprecated() {
|
| + deprecated_ = false;
|
| + clear_has_deprecated();
|
| +}
|
| +inline bool FileOptions::deprecated() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.deprecated)
|
| + return deprecated_;
|
| +}
|
| +inline void FileOptions::set_deprecated(bool value) {
|
| + set_has_deprecated();
|
| + deprecated_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.deprecated)
|
| +}
|
| +
|
| +// optional bool cc_enable_arenas = 31 [default = false];
|
| +inline bool FileOptions::has_cc_enable_arenas() const {
|
| + return (_has_bits_[0] & 0x00000800u) != 0;
|
| +}
|
| +inline void FileOptions::set_has_cc_enable_arenas() {
|
| + _has_bits_[0] |= 0x00000800u;
|
| +}
|
| +inline void FileOptions::clear_has_cc_enable_arenas() {
|
| + _has_bits_[0] &= ~0x00000800u;
|
| +}
|
| +inline void FileOptions::clear_cc_enable_arenas() {
|
| + cc_enable_arenas_ = false;
|
| + clear_has_cc_enable_arenas();
|
| +}
|
| +inline bool FileOptions::cc_enable_arenas() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.cc_enable_arenas)
|
| + return cc_enable_arenas_;
|
| +}
|
| +inline void FileOptions::set_cc_enable_arenas(bool value) {
|
| + set_has_cc_enable_arenas();
|
| + cc_enable_arenas_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_enable_arenas)
|
| +}
|
| +
|
| +// optional string objc_class_prefix = 36;
|
| +inline bool FileOptions::has_objc_class_prefix() const {
|
| + return (_has_bits_[0] & 0x00001000u) != 0;
|
| +}
|
| +inline void FileOptions::set_has_objc_class_prefix() {
|
| + _has_bits_[0] |= 0x00001000u;
|
| +}
|
| +inline void FileOptions::clear_has_objc_class_prefix() {
|
| + _has_bits_[0] &= ~0x00001000u;
|
| +}
|
| +inline void FileOptions::clear_objc_class_prefix() {
|
| + objc_class_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + clear_has_objc_class_prefix();
|
| +}
|
| +inline const ::std::string& FileOptions::objc_class_prefix() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.objc_class_prefix)
|
| + return objc_class_prefix_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline void FileOptions::set_objc_class_prefix(const ::std::string& value) {
|
| + set_has_objc_class_prefix();
|
| + objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.objc_class_prefix)
|
| +}
|
| +inline void FileOptions::set_objc_class_prefix(const char* value) {
|
| + set_has_objc_class_prefix();
|
| + objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.objc_class_prefix)
|
| +}
|
| +inline void FileOptions::set_objc_class_prefix(const char* value, size_t size) {
|
| + set_has_objc_class_prefix();
|
| + objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.objc_class_prefix)
|
| +}
|
| +inline ::std::string* FileOptions::mutable_objc_class_prefix() {
|
| + set_has_objc_class_prefix();
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.objc_class_prefix)
|
| + return objc_class_prefix_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline ::std::string* FileOptions::release_objc_class_prefix() {
|
| + clear_has_objc_class_prefix();
|
| + return objc_class_prefix_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline void FileOptions::set_allocated_objc_class_prefix(::std::string* objc_class_prefix) {
|
| + if (objc_class_prefix != NULL) {
|
| + set_has_objc_class_prefix();
|
| + } else {
|
| + clear_has_objc_class_prefix();
|
| + }
|
| + objc_class_prefix_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), objc_class_prefix);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.objc_class_prefix)
|
| +}
|
| +
|
| +// optional string csharp_namespace = 37;
|
| +inline bool FileOptions::has_csharp_namespace() const {
|
| + return (_has_bits_[0] & 0x00002000u) != 0;
|
| +}
|
| +inline void FileOptions::set_has_csharp_namespace() {
|
| + _has_bits_[0] |= 0x00002000u;
|
| +}
|
| +inline void FileOptions::clear_has_csharp_namespace() {
|
| + _has_bits_[0] &= ~0x00002000u;
|
| +}
|
| +inline void FileOptions::clear_csharp_namespace() {
|
| + csharp_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + clear_has_csharp_namespace();
|
| +}
|
| +inline const ::std::string& FileOptions::csharp_namespace() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.csharp_namespace)
|
| + return csharp_namespace_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline void FileOptions::set_csharp_namespace(const ::std::string& value) {
|
| + set_has_csharp_namespace();
|
| + csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.csharp_namespace)
|
| +}
|
| +inline void FileOptions::set_csharp_namespace(const char* value) {
|
| + set_has_csharp_namespace();
|
| + csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.csharp_namespace)
|
| +}
|
| +inline void FileOptions::set_csharp_namespace(const char* value, size_t size) {
|
| + set_has_csharp_namespace();
|
| + csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.csharp_namespace)
|
| +}
|
| +inline ::std::string* FileOptions::mutable_csharp_namespace() {
|
| + set_has_csharp_namespace();
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.csharp_namespace)
|
| + return csharp_namespace_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline ::std::string* FileOptions::release_csharp_namespace() {
|
| + clear_has_csharp_namespace();
|
| + return csharp_namespace_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| +}
|
| +inline void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_namespace) {
|
| + if (csharp_namespace != NULL) {
|
| + set_has_csharp_namespace();
|
| + } else {
|
| + clear_has_csharp_namespace();
|
| + }
|
| + csharp_namespace_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), csharp_namespace);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace)
|
| +}
|
| +
|
| +// optional bool javanano_use_deprecated_package = 38;
|
| +inline bool FileOptions::has_javanano_use_deprecated_package() const {
|
| + return (_has_bits_[0] & 0x00004000u) != 0;
|
| +}
|
| +inline void FileOptions::set_has_javanano_use_deprecated_package() {
|
| + _has_bits_[0] |= 0x00004000u;
|
| +}
|
| +inline void FileOptions::clear_has_javanano_use_deprecated_package() {
|
| + _has_bits_[0] &= ~0x00004000u;
|
| +}
|
| +inline void FileOptions::clear_javanano_use_deprecated_package() {
|
| + javanano_use_deprecated_package_ = false;
|
| + clear_has_javanano_use_deprecated_package();
|
| +}
|
| +inline bool FileOptions::javanano_use_deprecated_package() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.javanano_use_deprecated_package)
|
| + return javanano_use_deprecated_package_;
|
| +}
|
| +inline void FileOptions::set_javanano_use_deprecated_package(bool value) {
|
| + set_has_javanano_use_deprecated_package();
|
| + javanano_use_deprecated_package_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.javanano_use_deprecated_package)
|
| }
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| @@ -4926,22 +6002,27 @@ inline void FileOptions::clear_uninterpreted_option() {
|
| uninterpreted_option_.Clear();
|
| }
|
| inline const ::google::protobuf::UninterpretedOption& FileOptions::uninterpreted_option(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.uninterpreted_option)
|
| return uninterpreted_option_.Get(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* FileOptions::mutable_uninterpreted_option(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.uninterpreted_option)
|
| return uninterpreted_option_.Mutable(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* FileOptions::add_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.FileOptions.uninterpreted_option)
|
| return uninterpreted_option_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -FileOptions::uninterpreted_option() const {
|
| - return uninterpreted_option_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| FileOptions::mutable_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileOptions.uninterpreted_option)
|
| return &uninterpreted_option_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| +FileOptions::uninterpreted_option() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.FileOptions.uninterpreted_option)
|
| + return uninterpreted_option_;
|
| +}
|
|
|
| // -------------------------------------------------------------------
|
|
|
| @@ -4962,11 +6043,13 @@ inline void MessageOptions::clear_message_set_wire_format() {
|
| clear_has_message_set_wire_format();
|
| }
|
| inline bool MessageOptions::message_set_wire_format() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.message_set_wire_format)
|
| return message_set_wire_format_;
|
| }
|
| inline void MessageOptions::set_message_set_wire_format(bool value) {
|
| set_has_message_set_wire_format();
|
| message_set_wire_format_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.message_set_wire_format)
|
| }
|
|
|
| // optional bool no_standard_descriptor_accessor = 2 [default = false];
|
| @@ -4984,11 +6067,61 @@ inline void MessageOptions::clear_no_standard_descriptor_accessor() {
|
| clear_has_no_standard_descriptor_accessor();
|
| }
|
| inline bool MessageOptions::no_standard_descriptor_accessor() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.no_standard_descriptor_accessor)
|
| return no_standard_descriptor_accessor_;
|
| }
|
| inline void MessageOptions::set_no_standard_descriptor_accessor(bool value) {
|
| set_has_no_standard_descriptor_accessor();
|
| no_standard_descriptor_accessor_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.no_standard_descriptor_accessor)
|
| +}
|
| +
|
| +// optional bool deprecated = 3 [default = false];
|
| +inline bool MessageOptions::has_deprecated() const {
|
| + return (_has_bits_[0] & 0x00000004u) != 0;
|
| +}
|
| +inline void MessageOptions::set_has_deprecated() {
|
| + _has_bits_[0] |= 0x00000004u;
|
| +}
|
| +inline void MessageOptions::clear_has_deprecated() {
|
| + _has_bits_[0] &= ~0x00000004u;
|
| +}
|
| +inline void MessageOptions::clear_deprecated() {
|
| + deprecated_ = false;
|
| + clear_has_deprecated();
|
| +}
|
| +inline bool MessageOptions::deprecated() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.deprecated)
|
| + return deprecated_;
|
| +}
|
| +inline void MessageOptions::set_deprecated(bool value) {
|
| + set_has_deprecated();
|
| + deprecated_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.deprecated)
|
| +}
|
| +
|
| +// optional bool map_entry = 7;
|
| +inline bool MessageOptions::has_map_entry() const {
|
| + return (_has_bits_[0] & 0x00000008u) != 0;
|
| +}
|
| +inline void MessageOptions::set_has_map_entry() {
|
| + _has_bits_[0] |= 0x00000008u;
|
| +}
|
| +inline void MessageOptions::clear_has_map_entry() {
|
| + _has_bits_[0] &= ~0x00000008u;
|
| +}
|
| +inline void MessageOptions::clear_map_entry() {
|
| + map_entry_ = false;
|
| + clear_has_map_entry();
|
| +}
|
| +inline bool MessageOptions::map_entry() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.map_entry)
|
| + return map_entry_;
|
| +}
|
| +inline void MessageOptions::set_map_entry(bool value) {
|
| + set_has_map_entry();
|
| + map_entry_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.map_entry)
|
| }
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| @@ -4999,22 +6132,27 @@ inline void MessageOptions::clear_uninterpreted_option() {
|
| uninterpreted_option_.Clear();
|
| }
|
| inline const ::google::protobuf::UninterpretedOption& MessageOptions::uninterpreted_option(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.uninterpreted_option)
|
| return uninterpreted_option_.Get(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* MessageOptions::mutable_uninterpreted_option(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.MessageOptions.uninterpreted_option)
|
| return uninterpreted_option_.Mutable(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* MessageOptions::add_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.MessageOptions.uninterpreted_option)
|
| return uninterpreted_option_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -MessageOptions::uninterpreted_option() const {
|
| - return uninterpreted_option_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| MessageOptions::mutable_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.MessageOptions.uninterpreted_option)
|
| return &uninterpreted_option_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| +MessageOptions::uninterpreted_option() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.MessageOptions.uninterpreted_option)
|
| + return uninterpreted_option_;
|
| +}
|
|
|
| // -------------------------------------------------------------------
|
|
|
| @@ -5035,12 +6173,14 @@ inline void FieldOptions::clear_ctype() {
|
| clear_has_ctype();
|
| }
|
| inline ::google::protobuf::FieldOptions_CType FieldOptions::ctype() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.ctype)
|
| return static_cast< ::google::protobuf::FieldOptions_CType >(ctype_);
|
| }
|
| inline void FieldOptions::set_ctype(::google::protobuf::FieldOptions_CType value) {
|
| assert(::google::protobuf::FieldOptions_CType_IsValid(value));
|
| set_has_ctype();
|
| ctype_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.ctype)
|
| }
|
|
|
| // optional bool packed = 2;
|
| @@ -5058,125 +6198,86 @@ inline void FieldOptions::clear_packed() {
|
| clear_has_packed();
|
| }
|
| inline bool FieldOptions::packed() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.packed)
|
| return packed_;
|
| }
|
| inline void FieldOptions::set_packed(bool value) {
|
| set_has_packed();
|
| packed_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.packed)
|
| +}
|
| +
|
| +// optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
|
| +inline bool FieldOptions::has_jstype() const {
|
| + return (_has_bits_[0] & 0x00000004u) != 0;
|
| +}
|
| +inline void FieldOptions::set_has_jstype() {
|
| + _has_bits_[0] |= 0x00000004u;
|
| +}
|
| +inline void FieldOptions::clear_has_jstype() {
|
| + _has_bits_[0] &= ~0x00000004u;
|
| +}
|
| +inline void FieldOptions::clear_jstype() {
|
| + jstype_ = 0;
|
| + clear_has_jstype();
|
| +}
|
| +inline ::google::protobuf::FieldOptions_JSType FieldOptions::jstype() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.jstype)
|
| + return static_cast< ::google::protobuf::FieldOptions_JSType >(jstype_);
|
| +}
|
| +inline void FieldOptions::set_jstype(::google::protobuf::FieldOptions_JSType value) {
|
| + assert(::google::protobuf::FieldOptions_JSType_IsValid(value));
|
| + set_has_jstype();
|
| + jstype_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.jstype)
|
| }
|
|
|
| // optional bool lazy = 5 [default = false];
|
| inline bool FieldOptions::has_lazy() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| + return (_has_bits_[0] & 0x00000008u) != 0;
|
| }
|
| inline void FieldOptions::set_has_lazy() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| + _has_bits_[0] |= 0x00000008u;
|
| }
|
| inline void FieldOptions::clear_has_lazy() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| + _has_bits_[0] &= ~0x00000008u;
|
| }
|
| inline void FieldOptions::clear_lazy() {
|
| lazy_ = false;
|
| clear_has_lazy();
|
| }
|
| inline bool FieldOptions::lazy() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.lazy)
|
| return lazy_;
|
| }
|
| inline void FieldOptions::set_lazy(bool value) {
|
| set_has_lazy();
|
| lazy_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.lazy)
|
| }
|
|
|
| // optional bool deprecated = 3 [default = false];
|
| inline bool FieldOptions::has_deprecated() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| + return (_has_bits_[0] & 0x00000010u) != 0;
|
| }
|
| inline void FieldOptions::set_has_deprecated() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| + _has_bits_[0] |= 0x00000010u;
|
| }
|
| inline void FieldOptions::clear_has_deprecated() {
|
| - _has_bits_[0] &= ~0x00000008u;
|
| + _has_bits_[0] &= ~0x00000010u;
|
| }
|
| inline void FieldOptions::clear_deprecated() {
|
| deprecated_ = false;
|
| clear_has_deprecated();
|
| }
|
| inline bool FieldOptions::deprecated() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.deprecated)
|
| return deprecated_;
|
| }
|
| inline void FieldOptions::set_deprecated(bool value) {
|
| set_has_deprecated();
|
| deprecated_ = value;
|
| -}
|
| -
|
| -// optional string experimental_map_key = 9;
|
| -inline bool FieldOptions::has_experimental_map_key() const {
|
| - return (_has_bits_[0] & 0x00000010u) != 0;
|
| -}
|
| -inline void FieldOptions::set_has_experimental_map_key() {
|
| - _has_bits_[0] |= 0x00000010u;
|
| -}
|
| -inline void FieldOptions::clear_has_experimental_map_key() {
|
| - _has_bits_[0] &= ~0x00000010u;
|
| -}
|
| -inline void FieldOptions::clear_experimental_map_key() {
|
| - if (experimental_map_key_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - experimental_map_key_->clear();
|
| - }
|
| - clear_has_experimental_map_key();
|
| -}
|
| -inline const ::std::string& FieldOptions::experimental_map_key() const {
|
| - return *experimental_map_key_;
|
| -}
|
| -inline void FieldOptions::set_experimental_map_key(const ::std::string& value) {
|
| - set_has_experimental_map_key();
|
| - if (experimental_map_key_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - experimental_map_key_ = new ::std::string;
|
| - }
|
| - experimental_map_key_->assign(value);
|
| -}
|
| -inline void FieldOptions::set_experimental_map_key(const char* value) {
|
| - set_has_experimental_map_key();
|
| - if (experimental_map_key_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - experimental_map_key_ = new ::std::string;
|
| - }
|
| - experimental_map_key_->assign(value);
|
| -}
|
| -inline void FieldOptions::set_experimental_map_key(const char* value, size_t size) {
|
| - set_has_experimental_map_key();
|
| - if (experimental_map_key_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - experimental_map_key_ = new ::std::string;
|
| - }
|
| - experimental_map_key_->assign(reinterpret_cast<const char*>(value), size);
|
| -}
|
| -inline ::std::string* FieldOptions::mutable_experimental_map_key() {
|
| - set_has_experimental_map_key();
|
| - if (experimental_map_key_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - experimental_map_key_ = new ::std::string;
|
| - }
|
| - return experimental_map_key_;
|
| -}
|
| -inline ::std::string* FieldOptions::release_experimental_map_key() {
|
| - clear_has_experimental_map_key();
|
| - if (experimental_map_key_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = experimental_map_key_;
|
| - experimental_map_key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| -}
|
| -inline void FieldOptions::set_allocated_experimental_map_key(::std::string* experimental_map_key) {
|
| - if (experimental_map_key_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete experimental_map_key_;
|
| - }
|
| - if (experimental_map_key) {
|
| - set_has_experimental_map_key();
|
| - experimental_map_key_ = experimental_map_key;
|
| - } else {
|
| - clear_has_experimental_map_key();
|
| - experimental_map_key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - }
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.deprecated)
|
| }
|
|
|
| // optional bool weak = 10 [default = false];
|
| @@ -5194,11 +6295,13 @@ inline void FieldOptions::clear_weak() {
|
| clear_has_weak();
|
| }
|
| inline bool FieldOptions::weak() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.weak)
|
| return weak_;
|
| }
|
| inline void FieldOptions::set_weak(bool value) {
|
| set_has_weak();
|
| weak_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.weak)
|
| }
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| @@ -5209,28 +6312,33 @@ inline void FieldOptions::clear_uninterpreted_option() {
|
| uninterpreted_option_.Clear();
|
| }
|
| inline const ::google::protobuf::UninterpretedOption& FieldOptions::uninterpreted_option(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.uninterpreted_option)
|
| return uninterpreted_option_.Get(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* FieldOptions::mutable_uninterpreted_option(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.FieldOptions.uninterpreted_option)
|
| return uninterpreted_option_.Mutable(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* FieldOptions::add_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.FieldOptions.uninterpreted_option)
|
| return uninterpreted_option_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -FieldOptions::uninterpreted_option() const {
|
| - return uninterpreted_option_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| FieldOptions::mutable_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.FieldOptions.uninterpreted_option)
|
| return &uninterpreted_option_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| +FieldOptions::uninterpreted_option() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.FieldOptions.uninterpreted_option)
|
| + return uninterpreted_option_;
|
| +}
|
|
|
| // -------------------------------------------------------------------
|
|
|
| // EnumOptions
|
|
|
| -// optional bool allow_alias = 2 [default = true];
|
| +// optional bool allow_alias = 2;
|
| inline bool EnumOptions::has_allow_alias() const {
|
| return (_has_bits_[0] & 0x00000001u) != 0;
|
| }
|
| @@ -5241,15 +6349,41 @@ inline void EnumOptions::clear_has_allow_alias() {
|
| _has_bits_[0] &= ~0x00000001u;
|
| }
|
| inline void EnumOptions::clear_allow_alias() {
|
| - allow_alias_ = true;
|
| + allow_alias_ = false;
|
| clear_has_allow_alias();
|
| }
|
| inline bool EnumOptions::allow_alias() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.allow_alias)
|
| return allow_alias_;
|
| }
|
| inline void EnumOptions::set_allow_alias(bool value) {
|
| set_has_allow_alias();
|
| allow_alias_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.allow_alias)
|
| +}
|
| +
|
| +// optional bool deprecated = 3 [default = false];
|
| +inline bool EnumOptions::has_deprecated() const {
|
| + return (_has_bits_[0] & 0x00000002u) != 0;
|
| +}
|
| +inline void EnumOptions::set_has_deprecated() {
|
| + _has_bits_[0] |= 0x00000002u;
|
| +}
|
| +inline void EnumOptions::clear_has_deprecated() {
|
| + _has_bits_[0] &= ~0x00000002u;
|
| +}
|
| +inline void EnumOptions::clear_deprecated() {
|
| + deprecated_ = false;
|
| + clear_has_deprecated();
|
| +}
|
| +inline bool EnumOptions::deprecated() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.deprecated)
|
| + return deprecated_;
|
| +}
|
| +inline void EnumOptions::set_deprecated(bool value) {
|
| + set_has_deprecated();
|
| + deprecated_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated)
|
| }
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| @@ -5260,27 +6394,56 @@ inline void EnumOptions::clear_uninterpreted_option() {
|
| uninterpreted_option_.Clear();
|
| }
|
| inline const ::google::protobuf::UninterpretedOption& EnumOptions::uninterpreted_option(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.uninterpreted_option)
|
| return uninterpreted_option_.Get(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* EnumOptions::mutable_uninterpreted_option(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.EnumOptions.uninterpreted_option)
|
| return uninterpreted_option_.Mutable(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* EnumOptions::add_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.EnumOptions.uninterpreted_option)
|
| return uninterpreted_option_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -EnumOptions::uninterpreted_option() const {
|
| - return uninterpreted_option_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| EnumOptions::mutable_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumOptions.uninterpreted_option)
|
| return &uninterpreted_option_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| +EnumOptions::uninterpreted_option() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.EnumOptions.uninterpreted_option)
|
| + return uninterpreted_option_;
|
| +}
|
|
|
| // -------------------------------------------------------------------
|
|
|
| // EnumValueOptions
|
|
|
| +// optional bool deprecated = 1 [default = false];
|
| +inline bool EnumValueOptions::has_deprecated() const {
|
| + return (_has_bits_[0] & 0x00000001u) != 0;
|
| +}
|
| +inline void EnumValueOptions::set_has_deprecated() {
|
| + _has_bits_[0] |= 0x00000001u;
|
| +}
|
| +inline void EnumValueOptions::clear_has_deprecated() {
|
| + _has_bits_[0] &= ~0x00000001u;
|
| +}
|
| +inline void EnumValueOptions::clear_deprecated() {
|
| + deprecated_ = false;
|
| + clear_has_deprecated();
|
| +}
|
| +inline bool EnumValueOptions::deprecated() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.deprecated)
|
| + return deprecated_;
|
| +}
|
| +inline void EnumValueOptions::set_deprecated(bool value) {
|
| + set_has_deprecated();
|
| + deprecated_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.deprecated)
|
| +}
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| inline int EnumValueOptions::uninterpreted_option_size() const {
|
| return uninterpreted_option_.size();
|
| @@ -5289,27 +6452,56 @@ inline void EnumValueOptions::clear_uninterpreted_option() {
|
| uninterpreted_option_.Clear();
|
| }
|
| inline const ::google::protobuf::UninterpretedOption& EnumValueOptions::uninterpreted_option(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.uninterpreted_option)
|
| return uninterpreted_option_.Get(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* EnumValueOptions::mutable_uninterpreted_option(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueOptions.uninterpreted_option)
|
| return uninterpreted_option_.Mutable(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* EnumValueOptions::add_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.EnumValueOptions.uninterpreted_option)
|
| return uninterpreted_option_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -EnumValueOptions::uninterpreted_option() const {
|
| - return uninterpreted_option_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| EnumValueOptions::mutable_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValueOptions.uninterpreted_option)
|
| return &uninterpreted_option_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| +EnumValueOptions::uninterpreted_option() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.EnumValueOptions.uninterpreted_option)
|
| + return uninterpreted_option_;
|
| +}
|
|
|
| // -------------------------------------------------------------------
|
|
|
| // ServiceOptions
|
|
|
| +// optional bool deprecated = 33 [default = false];
|
| +inline bool ServiceOptions::has_deprecated() const {
|
| + return (_has_bits_[0] & 0x00000001u) != 0;
|
| +}
|
| +inline void ServiceOptions::set_has_deprecated() {
|
| + _has_bits_[0] |= 0x00000001u;
|
| +}
|
| +inline void ServiceOptions::clear_has_deprecated() {
|
| + _has_bits_[0] &= ~0x00000001u;
|
| +}
|
| +inline void ServiceOptions::clear_deprecated() {
|
| + deprecated_ = false;
|
| + clear_has_deprecated();
|
| +}
|
| +inline bool ServiceOptions::deprecated() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.deprecated)
|
| + return deprecated_;
|
| +}
|
| +inline void ServiceOptions::set_deprecated(bool value) {
|
| + set_has_deprecated();
|
| + deprecated_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.ServiceOptions.deprecated)
|
| +}
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| inline int ServiceOptions::uninterpreted_option_size() const {
|
| return uninterpreted_option_.size();
|
| @@ -5318,27 +6510,56 @@ inline void ServiceOptions::clear_uninterpreted_option() {
|
| uninterpreted_option_.Clear();
|
| }
|
| inline const ::google::protobuf::UninterpretedOption& ServiceOptions::uninterpreted_option(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.uninterpreted_option)
|
| return uninterpreted_option_.Get(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* ServiceOptions::mutable_uninterpreted_option(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceOptions.uninterpreted_option)
|
| return uninterpreted_option_.Mutable(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* ServiceOptions::add_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.ServiceOptions.uninterpreted_option)
|
| return uninterpreted_option_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -ServiceOptions::uninterpreted_option() const {
|
| - return uninterpreted_option_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| ServiceOptions::mutable_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceOptions.uninterpreted_option)
|
| return &uninterpreted_option_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| +ServiceOptions::uninterpreted_option() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.ServiceOptions.uninterpreted_option)
|
| + return uninterpreted_option_;
|
| +}
|
|
|
| // -------------------------------------------------------------------
|
|
|
| // MethodOptions
|
|
|
| +// optional bool deprecated = 33 [default = false];
|
| +inline bool MethodOptions::has_deprecated() const {
|
| + return (_has_bits_[0] & 0x00000001u) != 0;
|
| +}
|
| +inline void MethodOptions::set_has_deprecated() {
|
| + _has_bits_[0] |= 0x00000001u;
|
| +}
|
| +inline void MethodOptions::clear_has_deprecated() {
|
| + _has_bits_[0] &= ~0x00000001u;
|
| +}
|
| +inline void MethodOptions::clear_deprecated() {
|
| + deprecated_ = false;
|
| + clear_has_deprecated();
|
| +}
|
| +inline bool MethodOptions::deprecated() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.deprecated)
|
| + return deprecated_;
|
| +}
|
| +inline void MethodOptions::set_deprecated(bool value) {
|
| + set_has_deprecated();
|
| + deprecated_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.deprecated)
|
| +}
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| inline int MethodOptions::uninterpreted_option_size() const {
|
| return uninterpreted_option_.size();
|
| @@ -5347,22 +6568,27 @@ inline void MethodOptions::clear_uninterpreted_option() {
|
| uninterpreted_option_.Clear();
|
| }
|
| inline const ::google::protobuf::UninterpretedOption& MethodOptions::uninterpreted_option(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.uninterpreted_option)
|
| return uninterpreted_option_.Get(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* MethodOptions::mutable_uninterpreted_option(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.MethodOptions.uninterpreted_option)
|
| return uninterpreted_option_.Mutable(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption* MethodOptions::add_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.MethodOptions.uninterpreted_option)
|
| return uninterpreted_option_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -MethodOptions::uninterpreted_option() const {
|
| - return uninterpreted_option_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| MethodOptions::mutable_uninterpreted_option() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.MethodOptions.uninterpreted_option)
|
| return &uninterpreted_option_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| +MethodOptions::uninterpreted_option() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.MethodOptions.uninterpreted_option)
|
| + return uninterpreted_option_;
|
| +}
|
|
|
| // -------------------------------------------------------------------
|
|
|
| @@ -5379,63 +6605,46 @@ inline void UninterpretedOption_NamePart::clear_has_name_part() {
|
| _has_bits_[0] &= ~0x00000001u;
|
| }
|
| inline void UninterpretedOption_NamePart::clear_name_part() {
|
| - if (name_part_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - name_part_->clear();
|
| - }
|
| + name_part_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_name_part();
|
| }
|
| inline const ::std::string& UninterpretedOption_NamePart::name_part() const {
|
| - return *name_part_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.NamePart.name_part)
|
| + return name_part_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption_NamePart::set_name_part(const ::std::string& value) {
|
| set_has_name_part();
|
| - if (name_part_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_part_ = new ::std::string;
|
| - }
|
| - name_part_->assign(value);
|
| + name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.name_part)
|
| }
|
| inline void UninterpretedOption_NamePart::set_name_part(const char* value) {
|
| set_has_name_part();
|
| - if (name_part_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_part_ = new ::std::string;
|
| - }
|
| - name_part_->assign(value);
|
| + name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.NamePart.name_part)
|
| }
|
| inline void UninterpretedOption_NamePart::set_name_part(const char* value, size_t size) {
|
| set_has_name_part();
|
| - if (name_part_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_part_ = new ::std::string;
|
| - }
|
| - name_part_->assign(reinterpret_cast<const char*>(value), size);
|
| + name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.NamePart.name_part)
|
| }
|
| inline ::std::string* UninterpretedOption_NamePart::mutable_name_part() {
|
| set_has_name_part();
|
| - if (name_part_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - name_part_ = new ::std::string;
|
| - }
|
| - return name_part_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.NamePart.name_part)
|
| + return name_part_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* UninterpretedOption_NamePart::release_name_part() {
|
| clear_has_name_part();
|
| - if (name_part_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = name_part_;
|
| - name_part_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return name_part_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption_NamePart::set_allocated_name_part(::std::string* name_part) {
|
| - if (name_part_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete name_part_;
|
| - }
|
| - if (name_part) {
|
| + if (name_part != NULL) {
|
| set_has_name_part();
|
| - name_part_ = name_part;
|
| } else {
|
| clear_has_name_part();
|
| - name_part_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + name_part_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name_part);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.NamePart.name_part)
|
| }
|
|
|
| // required bool is_extension = 2;
|
| @@ -5453,11 +6662,13 @@ inline void UninterpretedOption_NamePart::clear_is_extension() {
|
| clear_has_is_extension();
|
| }
|
| inline bool UninterpretedOption_NamePart::is_extension() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.NamePart.is_extension)
|
| return is_extension_;
|
| }
|
| inline void UninterpretedOption_NamePart::set_is_extension(bool value) {
|
| set_has_is_extension();
|
| is_extension_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.is_extension)
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -5472,22 +6683,27 @@ inline void UninterpretedOption::clear_name() {
|
| name_.Clear();
|
| }
|
| inline const ::google::protobuf::UninterpretedOption_NamePart& UninterpretedOption::name(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.name)
|
| return name_.Get(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::mutable_name(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.name)
|
| return name_.Mutable(index);
|
| }
|
| inline ::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::add_name() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.UninterpretedOption.name)
|
| return name_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >&
|
| -UninterpretedOption::name() const {
|
| - return name_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >*
|
| UninterpretedOption::mutable_name() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.UninterpretedOption.name)
|
| return &name_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >&
|
| +UninterpretedOption::name() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.UninterpretedOption.name)
|
| + return name_;
|
| +}
|
|
|
| // optional string identifier_value = 3;
|
| inline bool UninterpretedOption::has_identifier_value() const {
|
| @@ -5500,63 +6716,46 @@ inline void UninterpretedOption::clear_has_identifier_value() {
|
| _has_bits_[0] &= ~0x00000002u;
|
| }
|
| inline void UninterpretedOption::clear_identifier_value() {
|
| - if (identifier_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - identifier_value_->clear();
|
| - }
|
| + identifier_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_identifier_value();
|
| }
|
| inline const ::std::string& UninterpretedOption::identifier_value() const {
|
| - return *identifier_value_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.identifier_value)
|
| + return identifier_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption::set_identifier_value(const ::std::string& value) {
|
| set_has_identifier_value();
|
| - if (identifier_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - identifier_value_ = new ::std::string;
|
| - }
|
| - identifier_value_->assign(value);
|
| + identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.identifier_value)
|
| }
|
| inline void UninterpretedOption::set_identifier_value(const char* value) {
|
| set_has_identifier_value();
|
| - if (identifier_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - identifier_value_ = new ::std::string;
|
| - }
|
| - identifier_value_->assign(value);
|
| + identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.identifier_value)
|
| }
|
| inline void UninterpretedOption::set_identifier_value(const char* value, size_t size) {
|
| set_has_identifier_value();
|
| - if (identifier_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - identifier_value_ = new ::std::string;
|
| - }
|
| - identifier_value_->assign(reinterpret_cast<const char*>(value), size);
|
| + identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.identifier_value)
|
| }
|
| inline ::std::string* UninterpretedOption::mutable_identifier_value() {
|
| set_has_identifier_value();
|
| - if (identifier_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - identifier_value_ = new ::std::string;
|
| - }
|
| - return identifier_value_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.identifier_value)
|
| + return identifier_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* UninterpretedOption::release_identifier_value() {
|
| clear_has_identifier_value();
|
| - if (identifier_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = identifier_value_;
|
| - identifier_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return identifier_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption::set_allocated_identifier_value(::std::string* identifier_value) {
|
| - if (identifier_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete identifier_value_;
|
| - }
|
| - if (identifier_value) {
|
| + if (identifier_value != NULL) {
|
| set_has_identifier_value();
|
| - identifier_value_ = identifier_value;
|
| } else {
|
| clear_has_identifier_value();
|
| - identifier_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + identifier_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), identifier_value);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.identifier_value)
|
| }
|
|
|
| // optional uint64 positive_int_value = 4;
|
| @@ -5574,11 +6773,13 @@ inline void UninterpretedOption::clear_positive_int_value() {
|
| clear_has_positive_int_value();
|
| }
|
| inline ::google::protobuf::uint64 UninterpretedOption::positive_int_value() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.positive_int_value)
|
| return positive_int_value_;
|
| }
|
| inline void UninterpretedOption::set_positive_int_value(::google::protobuf::uint64 value) {
|
| set_has_positive_int_value();
|
| positive_int_value_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.positive_int_value)
|
| }
|
|
|
| // optional int64 negative_int_value = 5;
|
| @@ -5596,11 +6797,13 @@ inline void UninterpretedOption::clear_negative_int_value() {
|
| clear_has_negative_int_value();
|
| }
|
| inline ::google::protobuf::int64 UninterpretedOption::negative_int_value() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.negative_int_value)
|
| return negative_int_value_;
|
| }
|
| inline void UninterpretedOption::set_negative_int_value(::google::protobuf::int64 value) {
|
| set_has_negative_int_value();
|
| negative_int_value_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.negative_int_value)
|
| }
|
|
|
| // optional double double_value = 6;
|
| @@ -5618,11 +6821,13 @@ inline void UninterpretedOption::clear_double_value() {
|
| clear_has_double_value();
|
| }
|
| inline double UninterpretedOption::double_value() const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.double_value)
|
| return double_value_;
|
| }
|
| inline void UninterpretedOption::set_double_value(double value) {
|
| set_has_double_value();
|
| double_value_ = value;
|
| + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.double_value)
|
| }
|
|
|
| // optional bytes string_value = 7;
|
| @@ -5636,63 +6841,46 @@ inline void UninterpretedOption::clear_has_string_value() {
|
| _has_bits_[0] &= ~0x00000020u;
|
| }
|
| inline void UninterpretedOption::clear_string_value() {
|
| - if (string_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - string_value_->clear();
|
| - }
|
| + string_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_string_value();
|
| }
|
| inline const ::std::string& UninterpretedOption::string_value() const {
|
| - return *string_value_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.string_value)
|
| + return string_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption::set_string_value(const ::std::string& value) {
|
| set_has_string_value();
|
| - if (string_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - string_value_ = new ::std::string;
|
| - }
|
| - string_value_->assign(value);
|
| + string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.string_value)
|
| }
|
| inline void UninterpretedOption::set_string_value(const char* value) {
|
| set_has_string_value();
|
| - if (string_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - string_value_ = new ::std::string;
|
| - }
|
| - string_value_->assign(value);
|
| + string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.string_value)
|
| }
|
| inline void UninterpretedOption::set_string_value(const void* value, size_t size) {
|
| set_has_string_value();
|
| - if (string_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - string_value_ = new ::std::string;
|
| - }
|
| - string_value_->assign(reinterpret_cast<const char*>(value), size);
|
| + string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.string_value)
|
| }
|
| inline ::std::string* UninterpretedOption::mutable_string_value() {
|
| set_has_string_value();
|
| - if (string_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - string_value_ = new ::std::string;
|
| - }
|
| - return string_value_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.string_value)
|
| + return string_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* UninterpretedOption::release_string_value() {
|
| clear_has_string_value();
|
| - if (string_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = string_value_;
|
| - string_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return string_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption::set_allocated_string_value(::std::string* string_value) {
|
| - if (string_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete string_value_;
|
| - }
|
| - if (string_value) {
|
| + if (string_value != NULL) {
|
| set_has_string_value();
|
| - string_value_ = string_value;
|
| } else {
|
| clear_has_string_value();
|
| - string_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + string_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), string_value);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.string_value)
|
| }
|
|
|
| // optional string aggregate_value = 8;
|
| @@ -5706,63 +6894,46 @@ inline void UninterpretedOption::clear_has_aggregate_value() {
|
| _has_bits_[0] &= ~0x00000040u;
|
| }
|
| inline void UninterpretedOption::clear_aggregate_value() {
|
| - if (aggregate_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - aggregate_value_->clear();
|
| - }
|
| + aggregate_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_aggregate_value();
|
| }
|
| inline const ::std::string& UninterpretedOption::aggregate_value() const {
|
| - return *aggregate_value_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.aggregate_value)
|
| + return aggregate_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption::set_aggregate_value(const ::std::string& value) {
|
| set_has_aggregate_value();
|
| - if (aggregate_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - aggregate_value_ = new ::std::string;
|
| - }
|
| - aggregate_value_->assign(value);
|
| + aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.aggregate_value)
|
| }
|
| inline void UninterpretedOption::set_aggregate_value(const char* value) {
|
| set_has_aggregate_value();
|
| - if (aggregate_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - aggregate_value_ = new ::std::string;
|
| - }
|
| - aggregate_value_->assign(value);
|
| + aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.aggregate_value)
|
| }
|
| inline void UninterpretedOption::set_aggregate_value(const char* value, size_t size) {
|
| set_has_aggregate_value();
|
| - if (aggregate_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - aggregate_value_ = new ::std::string;
|
| - }
|
| - aggregate_value_->assign(reinterpret_cast<const char*>(value), size);
|
| + aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.aggregate_value)
|
| }
|
| inline ::std::string* UninterpretedOption::mutable_aggregate_value() {
|
| set_has_aggregate_value();
|
| - if (aggregate_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - aggregate_value_ = new ::std::string;
|
| - }
|
| - return aggregate_value_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.aggregate_value)
|
| + return aggregate_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* UninterpretedOption::release_aggregate_value() {
|
| clear_has_aggregate_value();
|
| - if (aggregate_value_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = aggregate_value_;
|
| - aggregate_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return aggregate_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption::set_allocated_aggregate_value(::std::string* aggregate_value) {
|
| - if (aggregate_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete aggregate_value_;
|
| - }
|
| - if (aggregate_value) {
|
| + if (aggregate_value != NULL) {
|
| set_has_aggregate_value();
|
| - aggregate_value_ = aggregate_value;
|
| } else {
|
| clear_has_aggregate_value();
|
| - aggregate_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + aggregate_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), aggregate_value);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.aggregate_value)
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -5777,20 +6948,25 @@ inline void SourceCodeInfo_Location::clear_path() {
|
| path_.Clear();
|
| }
|
| inline ::google::protobuf::int32 SourceCodeInfo_Location::path(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.path)
|
| return path_.Get(index);
|
| }
|
| inline void SourceCodeInfo_Location::set_path(int index, ::google::protobuf::int32 value) {
|
| path_.Set(index, value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.path)
|
| }
|
| inline void SourceCodeInfo_Location::add_path(::google::protobuf::int32 value) {
|
| path_.Add(value);
|
| + // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.path)
|
| }
|
| inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| SourceCodeInfo_Location::path() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.path)
|
| return path_;
|
| }
|
| inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| SourceCodeInfo_Location::mutable_path() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.path)
|
| return &path_;
|
| }
|
|
|
| @@ -5802,20 +6978,25 @@ inline void SourceCodeInfo_Location::clear_span() {
|
| span_.Clear();
|
| }
|
| inline ::google::protobuf::int32 SourceCodeInfo_Location::span(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.span)
|
| return span_.Get(index);
|
| }
|
| inline void SourceCodeInfo_Location::set_span(int index, ::google::protobuf::int32 value) {
|
| span_.Set(index, value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.span)
|
| }
|
| inline void SourceCodeInfo_Location::add_span(::google::protobuf::int32 value) {
|
| span_.Add(value);
|
| + // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.span)
|
| }
|
| inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
|
| SourceCodeInfo_Location::span() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.span)
|
| return span_;
|
| }
|
| inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| SourceCodeInfo_Location::mutable_span() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.span)
|
| return &span_;
|
| }
|
|
|
| @@ -5830,63 +7011,46 @@ inline void SourceCodeInfo_Location::clear_has_leading_comments() {
|
| _has_bits_[0] &= ~0x00000004u;
|
| }
|
| inline void SourceCodeInfo_Location::clear_leading_comments() {
|
| - if (leading_comments_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - leading_comments_->clear();
|
| - }
|
| + leading_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_leading_comments();
|
| }
|
| inline const ::std::string& SourceCodeInfo_Location::leading_comments() const {
|
| - return *leading_comments_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_comments)
|
| + return leading_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void SourceCodeInfo_Location::set_leading_comments(const ::std::string& value) {
|
| set_has_leading_comments();
|
| - if (leading_comments_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - leading_comments_ = new ::std::string;
|
| - }
|
| - leading_comments_->assign(value);
|
| + leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_comments)
|
| }
|
| inline void SourceCodeInfo_Location::set_leading_comments(const char* value) {
|
| set_has_leading_comments();
|
| - if (leading_comments_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - leading_comments_ = new ::std::string;
|
| - }
|
| - leading_comments_->assign(value);
|
| + leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_comments)
|
| }
|
| inline void SourceCodeInfo_Location::set_leading_comments(const char* value, size_t size) {
|
| set_has_leading_comments();
|
| - if (leading_comments_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - leading_comments_ = new ::std::string;
|
| - }
|
| - leading_comments_->assign(reinterpret_cast<const char*>(value), size);
|
| + leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_comments)
|
| }
|
| inline ::std::string* SourceCodeInfo_Location::mutable_leading_comments() {
|
| set_has_leading_comments();
|
| - if (leading_comments_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - leading_comments_ = new ::std::string;
|
| - }
|
| - return leading_comments_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_comments)
|
| + return leading_comments_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* SourceCodeInfo_Location::release_leading_comments() {
|
| clear_has_leading_comments();
|
| - if (leading_comments_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = leading_comments_;
|
| - leading_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return leading_comments_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void SourceCodeInfo_Location::set_allocated_leading_comments(::std::string* leading_comments) {
|
| - if (leading_comments_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete leading_comments_;
|
| - }
|
| - if (leading_comments) {
|
| + if (leading_comments != NULL) {
|
| set_has_leading_comments();
|
| - leading_comments_ = leading_comments;
|
| } else {
|
| clear_has_leading_comments();
|
| - leading_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + leading_comments_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), leading_comments);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.leading_comments)
|
| }
|
|
|
| // optional string trailing_comments = 4;
|
| @@ -5900,63 +7064,100 @@ inline void SourceCodeInfo_Location::clear_has_trailing_comments() {
|
| _has_bits_[0] &= ~0x00000008u;
|
| }
|
| inline void SourceCodeInfo_Location::clear_trailing_comments() {
|
| - if (trailing_comments_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - trailing_comments_->clear();
|
| - }
|
| + trailing_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| clear_has_trailing_comments();
|
| }
|
| inline const ::std::string& SourceCodeInfo_Location::trailing_comments() const {
|
| - return *trailing_comments_;
|
| + // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.trailing_comments)
|
| + return trailing_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void SourceCodeInfo_Location::set_trailing_comments(const ::std::string& value) {
|
| set_has_trailing_comments();
|
| - if (trailing_comments_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - trailing_comments_ = new ::std::string;
|
| - }
|
| - trailing_comments_->assign(value);
|
| + trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| + // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.trailing_comments)
|
| }
|
| inline void SourceCodeInfo_Location::set_trailing_comments(const char* value) {
|
| set_has_trailing_comments();
|
| - if (trailing_comments_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - trailing_comments_ = new ::std::string;
|
| - }
|
| - trailing_comments_->assign(value);
|
| + trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.trailing_comments)
|
| }
|
| inline void SourceCodeInfo_Location::set_trailing_comments(const char* value, size_t size) {
|
| set_has_trailing_comments();
|
| - if (trailing_comments_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - trailing_comments_ = new ::std::string;
|
| - }
|
| - trailing_comments_->assign(reinterpret_cast<const char*>(value), size);
|
| + trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| + ::std::string(reinterpret_cast<const char*>(value), size));
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.trailing_comments)
|
| }
|
| inline ::std::string* SourceCodeInfo_Location::mutable_trailing_comments() {
|
| set_has_trailing_comments();
|
| - if (trailing_comments_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - trailing_comments_ = new ::std::string;
|
| - }
|
| - return trailing_comments_;
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.trailing_comments)
|
| + return trailing_comments_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline ::std::string* SourceCodeInfo_Location::release_trailing_comments() {
|
| clear_has_trailing_comments();
|
| - if (trailing_comments_ == &::google::protobuf::internal::GetEmptyString()) {
|
| - return NULL;
|
| - } else {
|
| - ::std::string* temp = trailing_comments_;
|
| - trailing_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| - return temp;
|
| - }
|
| + return trailing_comments_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void SourceCodeInfo_Location::set_allocated_trailing_comments(::std::string* trailing_comments) {
|
| - if (trailing_comments_ != &::google::protobuf::internal::GetEmptyString()) {
|
| - delete trailing_comments_;
|
| - }
|
| - if (trailing_comments) {
|
| + if (trailing_comments != NULL) {
|
| set_has_trailing_comments();
|
| - trailing_comments_ = trailing_comments;
|
| } else {
|
| clear_has_trailing_comments();
|
| - trailing_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| }
|
| + trailing_comments_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), trailing_comments);
|
| + // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.trailing_comments)
|
| +}
|
| +
|
| +// repeated string leading_detached_comments = 6;
|
| +inline int SourceCodeInfo_Location::leading_detached_comments_size() const {
|
| + return leading_detached_comments_.size();
|
| +}
|
| +inline void SourceCodeInfo_Location::clear_leading_detached_comments() {
|
| + leading_detached_comments_.Clear();
|
| +}
|
| +inline const ::std::string& SourceCodeInfo_Location::leading_detached_comments(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
|
| + return leading_detached_comments_.Get(index);
|
| +}
|
| +inline ::std::string* SourceCodeInfo_Location::mutable_leading_detached_comments(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
|
| + return leading_detached_comments_.Mutable(index);
|
| +}
|
| +inline void SourceCodeInfo_Location::set_leading_detached_comments(int index, const ::std::string& value) {
|
| + // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
|
| + leading_detached_comments_.Mutable(index)->assign(value);
|
| +}
|
| +inline void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value) {
|
| + leading_detached_comments_.Mutable(index)->assign(value);
|
| + // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
|
| +}
|
| +inline void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value, size_t size) {
|
| + leading_detached_comments_.Mutable(index)->assign(
|
| + reinterpret_cast<const char*>(value), size);
|
| + // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
|
| +}
|
| +inline ::std::string* SourceCodeInfo_Location::add_leading_detached_comments() {
|
| + return leading_detached_comments_.Add();
|
| +}
|
| +inline void SourceCodeInfo_Location::add_leading_detached_comments(const ::std::string& value) {
|
| + leading_detached_comments_.Add()->assign(value);
|
| + // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
|
| +}
|
| +inline void SourceCodeInfo_Location::add_leading_detached_comments(const char* value) {
|
| + leading_detached_comments_.Add()->assign(value);
|
| + // @@protoc_insertion_point(field_add_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
|
| +}
|
| +inline void SourceCodeInfo_Location::add_leading_detached_comments(const char* value, size_t size) {
|
| + leading_detached_comments_.Add()->assign(reinterpret_cast<const char*>(value), size);
|
| + // @@protoc_insertion_point(field_add_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
|
| +}
|
| +inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
|
| +SourceCodeInfo_Location::leading_detached_comments() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
|
| + return leading_detached_comments_;
|
| +}
|
| +inline ::google::protobuf::RepeatedPtrField< ::std::string>*
|
| +SourceCodeInfo_Location::mutable_leading_detached_comments() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
|
| + return &leading_detached_comments_;
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -5971,22 +7172,70 @@ inline void SourceCodeInfo::clear_location() {
|
| location_.Clear();
|
| }
|
| inline const ::google::protobuf::SourceCodeInfo_Location& SourceCodeInfo::location(int index) const {
|
| + // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.location)
|
| return location_.Get(index);
|
| }
|
| inline ::google::protobuf::SourceCodeInfo_Location* SourceCodeInfo::mutable_location(int index) {
|
| + // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.location)
|
| return location_.Mutable(index);
|
| }
|
| inline ::google::protobuf::SourceCodeInfo_Location* SourceCodeInfo::add_location() {
|
| + // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.location)
|
| return location_.Add();
|
| }
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location >&
|
| -SourceCodeInfo::location() const {
|
| - return location_;
|
| -}
|
| inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location >*
|
| SourceCodeInfo::mutable_location() {
|
| + // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.location)
|
| return &location_;
|
| }
|
| +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location >&
|
| +SourceCodeInfo::location() const {
|
| + // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.location)
|
| + return location_;
|
| +}
|
| +
|
| +#endif // !PROTOBUF_INLINE_NOT_IN_HEADERS
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
| +
|
| +// -------------------------------------------------------------------
|
|
|
|
|
| // @@protoc_insertion_point(namespace_scope)
|
| @@ -5998,25 +7247,34 @@ SourceCodeInfo::mutable_location() {
|
| namespace google {
|
| namespace protobuf {
|
|
|
| +template <> struct is_proto_enum< ::google::protobuf::FieldDescriptorProto_Type> : ::google::protobuf::internal::true_type {};
|
| template <>
|
| inline const EnumDescriptor* GetEnumDescriptor< ::google::protobuf::FieldDescriptorProto_Type>() {
|
| return ::google::protobuf::FieldDescriptorProto_Type_descriptor();
|
| }
|
| +template <> struct is_proto_enum< ::google::protobuf::FieldDescriptorProto_Label> : ::google::protobuf::internal::true_type {};
|
| template <>
|
| inline const EnumDescriptor* GetEnumDescriptor< ::google::protobuf::FieldDescriptorProto_Label>() {
|
| return ::google::protobuf::FieldDescriptorProto_Label_descriptor();
|
| }
|
| +template <> struct is_proto_enum< ::google::protobuf::FileOptions_OptimizeMode> : ::google::protobuf::internal::true_type {};
|
| template <>
|
| inline const EnumDescriptor* GetEnumDescriptor< ::google::protobuf::FileOptions_OptimizeMode>() {
|
| return ::google::protobuf::FileOptions_OptimizeMode_descriptor();
|
| }
|
| +template <> struct is_proto_enum< ::google::protobuf::FieldOptions_CType> : ::google::protobuf::internal::true_type {};
|
| template <>
|
| inline const EnumDescriptor* GetEnumDescriptor< ::google::protobuf::FieldOptions_CType>() {
|
| return ::google::protobuf::FieldOptions_CType_descriptor();
|
| }
|
| +template <> struct is_proto_enum< ::google::protobuf::FieldOptions_JSType> : ::google::protobuf::internal::true_type {};
|
| +template <>
|
| +inline const EnumDescriptor* GetEnumDescriptor< ::google::protobuf::FieldOptions_JSType>() {
|
| + return ::google::protobuf::FieldOptions_JSType_descriptor();
|
| +}
|
|
|
| -} // namespace google
|
| } // namespace protobuf
|
| +} // namespace google
|
| #endif // SWIG
|
|
|
| // @@protoc_insertion_point(global_scope)
|
|
|
Chromium Code Reviews
Issue 1842653006:
Update //third_party/protobuf to version 3. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master