Index: third_party/protobuf/src/google/protobuf/type.pb.h |
diff --git a/third_party/protobuf/src/google/protobuf/type.pb.h b/third_party/protobuf/src/google/protobuf/type.pb.h |
index 73fa35a311030a1557e524388e3e07b7c423dfa5..4255fa8c2e9b2a10947d9b469d7aa1895121ea01 100644 |
--- a/third_party/protobuf/src/google/protobuf/type.pb.h |
+++ b/third_party/protobuf/src/google/protobuf/type.pb.h |
@@ -8,12 +8,12 @@ |
#include <google/protobuf/stubs/common.h> |
-#if GOOGLE_PROTOBUF_VERSION < 3001000 |
+#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 3001000 < 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. |
@@ -24,45 +24,27 @@ |
#include <google/protobuf/generated_message_util.h> |
#include <google/protobuf/metadata.h> |
#include <google/protobuf/message.h> |
-#include <google/protobuf/repeated_field.h> // IWYU pragma: export |
-#include <google/protobuf/extension_set.h> // IWYU pragma: export |
+#include <google/protobuf/repeated_field.h> |
+#include <google/protobuf/extension_set.h> |
#include <google/protobuf/generated_enum_reflection.h> |
#include <google/protobuf/unknown_field_set.h> |
#include <google/protobuf/any.pb.h> |
#include <google/protobuf/source_context.pb.h> |
// @@protoc_insertion_point(includes) |
+ |
namespace google { |
namespace protobuf { |
-class Any; |
-class AnyDefaultTypeInternal; |
-LIBPROTOBUF_EXPORT extern AnyDefaultTypeInternal _Any_default_instance_; |
+ |
+// Internal implementation detail -- do not call these. |
+void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto(); |
+void protobuf_AssignDesc_google_2fprotobuf_2ftype_2eproto(); |
+void protobuf_ShutdownFile_google_2fprotobuf_2ftype_2eproto(); |
+ |
class Enum; |
-class EnumDefaultTypeInternal; |
-LIBPROTOBUF_EXPORT extern EnumDefaultTypeInternal _Enum_default_instance_; |
class EnumValue; |
-class EnumValueDefaultTypeInternal; |
-LIBPROTOBUF_EXPORT extern EnumValueDefaultTypeInternal _EnumValue_default_instance_; |
class Field; |
-class FieldDefaultTypeInternal; |
-LIBPROTOBUF_EXPORT extern FieldDefaultTypeInternal _Field_default_instance_; |
class Option; |
-class OptionDefaultTypeInternal; |
-LIBPROTOBUF_EXPORT extern OptionDefaultTypeInternal _Option_default_instance_; |
-class SourceContext; |
-class SourceContextDefaultTypeInternal; |
-LIBPROTOBUF_EXPORT extern SourceContextDefaultTypeInternal _SourceContext_default_instance_; |
class Type; |
-class TypeDefaultTypeInternal; |
-LIBPROTOBUF_EXPORT extern TypeDefaultTypeInternal _Type_default_instance_; |
-} // namespace protobuf |
-} // namespace google |
- |
-namespace google { |
-namespace protobuf { |
- |
-// Internal implementation detail -- do not call these. |
-void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto(); |
-void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto(); |
enum Field_Kind { |
Field_Kind_TYPE_UNKNOWN = 0, |
@@ -148,7 +130,7 @@ inline bool Syntax_Parse( |
} |
// =================================================================== |
-class LIBPROTOBUF_EXPORT Type : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Type) */ { |
+class LIBPROTOBUF_EXPORT Type : public ::google::protobuf::Message { |
public: |
Type(); |
virtual ~Type(); |
@@ -160,57 +142,35 @@ class LIBPROTOBUF_EXPORT Type : public ::google::protobuf::Message /* @@protoc_i |
return *this; |
} |
- inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL { |
- return GetArenaNoVirtual(); |
- } |
- inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL { |
- return MaybeArenaPtr(); |
- } |
static const ::google::protobuf::Descriptor* descriptor(); |
static const Type& default_instance(); |
- static inline const Type* internal_default_instance() { |
- return reinterpret_cast<const Type*>( |
- &_Type_default_instance_); |
- } |
- |
- void UnsafeArenaSwap(Type* other); |
void Swap(Type* other); |
// implements Message ---------------------------------------------- |
- inline Type* New() const PROTOBUF_FINAL { return New(NULL); } |
+ inline Type* New() const { return New(NULL); } |
- Type* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; |
- void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
- void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
+ Type* New(::google::protobuf::Arena* arena) const; |
+ void CopyFrom(const ::google::protobuf::Message& from); |
+ void MergeFrom(const ::google::protobuf::Message& from); |
void CopyFrom(const Type& from); |
void MergeFrom(const Type& from); |
- void Clear() PROTOBUF_FINAL; |
- bool IsInitialized() const PROTOBUF_FINAL; |
+ void Clear(); |
+ bool IsInitialized() const; |
- size_t ByteSizeLong() const PROTOBUF_FINAL; |
+ int ByteSize() const; |
bool MergePartialFromCodedStream( |
- ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; |
+ ::google::protobuf::io::CodedInputStream* input); |
void SerializeWithCachedSizes( |
- ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( |
- bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) |
- const PROTOBUF_FINAL { |
- return InternalSerializeWithCachedSizesToArray(false, output); |
- } |
- int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } |
+ ::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 PROTOBUF_FINAL; |
+ void SetCachedSize(int size) const; |
void InternalSwap(Type* other); |
- protected: |
- explicit Type(::google::protobuf::Arena* arena); |
- private: |
- static void ArenaDtor(void* object); |
- inline void RegisterArenaDtor(::google::protobuf::Arena* arena); |
private: |
inline ::google::protobuf::Arena* GetArenaNoVirtual() const { |
return _internal_metadata_.arena(); |
@@ -220,13 +180,13 @@ class LIBPROTOBUF_EXPORT Type : public ::google::protobuf::Message /* @@protoc_i |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
+ ::google::protobuf::Metadata GetMetadata() const; |
// nested types ---------------------------------------------------- |
// accessors ------------------------------------------------------- |
- // string name = 1; |
+ // optional string name = 1; |
void clear_name(); |
static const int kNameFieldNumber = 1; |
const ::std::string& name() const; |
@@ -236,9 +196,6 @@ class LIBPROTOBUF_EXPORT Type : public ::google::protobuf::Message /* @@protoc_i |
::std::string* mutable_name(); |
::std::string* release_name(); |
void set_allocated_name(::std::string* name); |
- ::std::string* unsafe_arena_release_name(); |
- void unsafe_arena_set_allocated_name( |
- ::std::string* name); |
// repeated .google.protobuf.Field fields = 2; |
int fields_size() const; |
@@ -280,23 +237,16 @@ class LIBPROTOBUF_EXPORT Type : public ::google::protobuf::Message /* @@protoc_i |
const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& |
options() const; |
- // .google.protobuf.SourceContext source_context = 5; |
+ // optional .google.protobuf.SourceContext source_context = 5; |
bool has_source_context() const; |
void clear_source_context(); |
static const int kSourceContextFieldNumber = 5; |
- private: |
- void _slow_mutable_source_context(); |
- ::google::protobuf::SourceContext* _slow_release_source_context(); |
- public: |
const ::google::protobuf::SourceContext& source_context() const; |
::google::protobuf::SourceContext* mutable_source_context(); |
::google::protobuf::SourceContext* release_source_context(); |
void set_allocated_source_context(::google::protobuf::SourceContext* source_context); |
- ::google::protobuf::SourceContext* unsafe_arena_release_source_context(); |
- void unsafe_arena_set_allocated_source_context( |
- ::google::protobuf::SourceContext* source_context); |
- // .google.protobuf.Syntax syntax = 6; |
+ // optional .google.protobuf.Syntax syntax = 6; |
void clear_syntax(); |
static const int kSyntaxFieldNumber = 6; |
::google::protobuf::Syntax syntax() const; |
@@ -306,25 +256,24 @@ class LIBPROTOBUF_EXPORT Type : public ::google::protobuf::Message /* @@protoc_i |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- friend class ::google::protobuf::Arena; |
- typedef void InternalArenaConstructable_; |
- typedef void DestructorSkippable_; |
+ bool _is_default_instance_; |
+ ::google::protobuf::internal::ArenaStringPtr name_; |
::google::protobuf::RepeatedPtrField< ::google::protobuf::Field > fields_; |
::google::protobuf::RepeatedPtrField< ::std::string> oneofs_; |
::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; |
- ::google::protobuf::internal::ArenaStringPtr name_; |
::google::protobuf::SourceContext* source_context_; |
int syntax_; |
mutable int _cached_size_; |
- friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto_impl(); |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto_impl(); |
- friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2ftype_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto(); |
+ friend void protobuf_AssignDesc_google_2fprotobuf_2ftype_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2ftype_2eproto(); |
+ void InitAsDefaultInstance(); |
+ static Type* default_instance_; |
}; |
// ------------------------------------------------------------------- |
-class LIBPROTOBUF_EXPORT Field : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Field) */ { |
+class LIBPROTOBUF_EXPORT Field : public ::google::protobuf::Message { |
public: |
Field(); |
virtual ~Field(); |
@@ -336,57 +285,35 @@ class LIBPROTOBUF_EXPORT Field : public ::google::protobuf::Message /* @@protoc_ |
return *this; |
} |
- inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL { |
- return GetArenaNoVirtual(); |
- } |
- inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL { |
- return MaybeArenaPtr(); |
- } |
static const ::google::protobuf::Descriptor* descriptor(); |
static const Field& default_instance(); |
- static inline const Field* internal_default_instance() { |
- return reinterpret_cast<const Field*>( |
- &_Field_default_instance_); |
- } |
- |
- void UnsafeArenaSwap(Field* other); |
void Swap(Field* other); |
// implements Message ---------------------------------------------- |
- inline Field* New() const PROTOBUF_FINAL { return New(NULL); } |
+ inline Field* New() const { return New(NULL); } |
- Field* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; |
- void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
- void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
+ Field* New(::google::protobuf::Arena* arena) const; |
+ void CopyFrom(const ::google::protobuf::Message& from); |
+ void MergeFrom(const ::google::protobuf::Message& from); |
void CopyFrom(const Field& from); |
void MergeFrom(const Field& from); |
- void Clear() PROTOBUF_FINAL; |
- bool IsInitialized() const PROTOBUF_FINAL; |
+ void Clear(); |
+ bool IsInitialized() const; |
- size_t ByteSizeLong() const PROTOBUF_FINAL; |
+ int ByteSize() const; |
bool MergePartialFromCodedStream( |
- ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; |
+ ::google::protobuf::io::CodedInputStream* input); |
void SerializeWithCachedSizes( |
- ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( |
- bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) |
- const PROTOBUF_FINAL { |
- return InternalSerializeWithCachedSizesToArray(false, output); |
- } |
- int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } |
+ ::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 PROTOBUF_FINAL; |
+ void SetCachedSize(int size) const; |
void InternalSwap(Field* other); |
- protected: |
- explicit Field(::google::protobuf::Arena* arena); |
- private: |
- static void ArenaDtor(void* object); |
- inline void RegisterArenaDtor(::google::protobuf::Arena* arena); |
private: |
inline ::google::protobuf::Arena* GetArenaNoVirtual() const { |
return _internal_metadata_.arena(); |
@@ -396,7 +323,7 @@ class LIBPROTOBUF_EXPORT Field : public ::google::protobuf::Message /* @@protoc_ |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
+ ::google::protobuf::Metadata GetMetadata() const; |
// nested types ---------------------------------------------------- |
@@ -492,25 +419,25 @@ class LIBPROTOBUF_EXPORT Field : public ::google::protobuf::Message /* @@protoc_ |
// accessors ------------------------------------------------------- |
- // .google.protobuf.Field.Kind kind = 1; |
+ // optional .google.protobuf.Field.Kind kind = 1; |
void clear_kind(); |
static const int kKindFieldNumber = 1; |
::google::protobuf::Field_Kind kind() const; |
void set_kind(::google::protobuf::Field_Kind value); |
- // .google.protobuf.Field.Cardinality cardinality = 2; |
+ // optional .google.protobuf.Field.Cardinality cardinality = 2; |
void clear_cardinality(); |
static const int kCardinalityFieldNumber = 2; |
::google::protobuf::Field_Cardinality cardinality() const; |
void set_cardinality(::google::protobuf::Field_Cardinality value); |
- // int32 number = 3; |
+ // optional int32 number = 3; |
void clear_number(); |
static const int kNumberFieldNumber = 3; |
::google::protobuf::int32 number() const; |
void set_number(::google::protobuf::int32 value); |
- // string name = 4; |
+ // optional string name = 4; |
void clear_name(); |
static const int kNameFieldNumber = 4; |
const ::std::string& name() const; |
@@ -520,11 +447,8 @@ class LIBPROTOBUF_EXPORT Field : public ::google::protobuf::Message /* @@protoc_ |
::std::string* mutable_name(); |
::std::string* release_name(); |
void set_allocated_name(::std::string* name); |
- ::std::string* unsafe_arena_release_name(); |
- void unsafe_arena_set_allocated_name( |
- ::std::string* name); |
- // string type_url = 6; |
+ // optional string type_url = 6; |
void clear_type_url(); |
static const int kTypeUrlFieldNumber = 6; |
const ::std::string& type_url() const; |
@@ -534,17 +458,14 @@ class LIBPROTOBUF_EXPORT Field : public ::google::protobuf::Message /* @@protoc_ |
::std::string* mutable_type_url(); |
::std::string* release_type_url(); |
void set_allocated_type_url(::std::string* type_url); |
- ::std::string* unsafe_arena_release_type_url(); |
- void unsafe_arena_set_allocated_type_url( |
- ::std::string* type_url); |
- // int32 oneof_index = 7; |
+ // optional int32 oneof_index = 7; |
void clear_oneof_index(); |
static const int kOneofIndexFieldNumber = 7; |
::google::protobuf::int32 oneof_index() const; |
void set_oneof_index(::google::protobuf::int32 value); |
- // bool packed = 8; |
+ // optional bool packed = 8; |
void clear_packed(); |
static const int kPackedFieldNumber = 8; |
bool packed() const; |
@@ -562,7 +483,7 @@ class LIBPROTOBUF_EXPORT Field : public ::google::protobuf::Message /* @@protoc_ |
const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& |
options() const; |
- // string json_name = 10; |
+ // optional string json_name = 10; |
void clear_json_name(); |
static const int kJsonNameFieldNumber = 10; |
const ::std::string& json_name() const; |
@@ -572,11 +493,8 @@ class LIBPROTOBUF_EXPORT Field : public ::google::protobuf::Message /* @@protoc_ |
::std::string* mutable_json_name(); |
::std::string* release_json_name(); |
void set_allocated_json_name(::std::string* json_name); |
- ::std::string* unsafe_arena_release_json_name(); |
- void unsafe_arena_set_allocated_json_name( |
- ::std::string* json_name); |
- // string default_value = 11; |
+ // optional string default_value = 11; |
void clear_default_value(); |
static const int kDefaultValueFieldNumber = 11; |
const ::std::string& default_value() const; |
@@ -586,37 +504,33 @@ class LIBPROTOBUF_EXPORT Field : public ::google::protobuf::Message /* @@protoc_ |
::std::string* mutable_default_value(); |
::std::string* release_default_value(); |
void set_allocated_default_value(::std::string* default_value); |
- ::std::string* unsafe_arena_release_default_value(); |
- void unsafe_arena_set_allocated_default_value( |
- ::std::string* default_value); |
// @@protoc_insertion_point(class_scope:google.protobuf.Field) |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- friend class ::google::protobuf::Arena; |
- typedef void InternalArenaConstructable_; |
- typedef void DestructorSkippable_; |
- ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; |
- ::google::protobuf::internal::ArenaStringPtr name_; |
- ::google::protobuf::internal::ArenaStringPtr type_url_; |
- ::google::protobuf::internal::ArenaStringPtr json_name_; |
- ::google::protobuf::internal::ArenaStringPtr default_value_; |
+ bool _is_default_instance_; |
int kind_; |
int cardinality_; |
+ ::google::protobuf::internal::ArenaStringPtr name_; |
::google::protobuf::int32 number_; |
::google::protobuf::int32 oneof_index_; |
+ ::google::protobuf::internal::ArenaStringPtr type_url_; |
+ ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; |
+ ::google::protobuf::internal::ArenaStringPtr json_name_; |
+ ::google::protobuf::internal::ArenaStringPtr default_value_; |
bool packed_; |
mutable int _cached_size_; |
- friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto_impl(); |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto_impl(); |
- friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2ftype_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto(); |
+ friend void protobuf_AssignDesc_google_2fprotobuf_2ftype_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2ftype_2eproto(); |
+ void InitAsDefaultInstance(); |
+ static Field* default_instance_; |
}; |
// ------------------------------------------------------------------- |
-class LIBPROTOBUF_EXPORT Enum : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Enum) */ { |
+class LIBPROTOBUF_EXPORT Enum : public ::google::protobuf::Message { |
public: |
Enum(); |
virtual ~Enum(); |
@@ -628,57 +542,35 @@ class LIBPROTOBUF_EXPORT Enum : public ::google::protobuf::Message /* @@protoc_i |
return *this; |
} |
- inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL { |
- return GetArenaNoVirtual(); |
- } |
- inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL { |
- return MaybeArenaPtr(); |
- } |
static const ::google::protobuf::Descriptor* descriptor(); |
static const Enum& default_instance(); |
- static inline const Enum* internal_default_instance() { |
- return reinterpret_cast<const Enum*>( |
- &_Enum_default_instance_); |
- } |
- |
- void UnsafeArenaSwap(Enum* other); |
void Swap(Enum* other); |
// implements Message ---------------------------------------------- |
- inline Enum* New() const PROTOBUF_FINAL { return New(NULL); } |
+ inline Enum* New() const { return New(NULL); } |
- Enum* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; |
- void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
- void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
+ Enum* New(::google::protobuf::Arena* arena) const; |
+ void CopyFrom(const ::google::protobuf::Message& from); |
+ void MergeFrom(const ::google::protobuf::Message& from); |
void CopyFrom(const Enum& from); |
void MergeFrom(const Enum& from); |
- void Clear() PROTOBUF_FINAL; |
- bool IsInitialized() const PROTOBUF_FINAL; |
+ void Clear(); |
+ bool IsInitialized() const; |
- size_t ByteSizeLong() const PROTOBUF_FINAL; |
+ int ByteSize() const; |
bool MergePartialFromCodedStream( |
- ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; |
+ ::google::protobuf::io::CodedInputStream* input); |
void SerializeWithCachedSizes( |
- ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( |
- bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) |
- const PROTOBUF_FINAL { |
- return InternalSerializeWithCachedSizesToArray(false, output); |
- } |
- int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } |
+ ::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 PROTOBUF_FINAL; |
+ void SetCachedSize(int size) const; |
void InternalSwap(Enum* other); |
- protected: |
- explicit Enum(::google::protobuf::Arena* arena); |
- private: |
- static void ArenaDtor(void* object); |
- inline void RegisterArenaDtor(::google::protobuf::Arena* arena); |
private: |
inline ::google::protobuf::Arena* GetArenaNoVirtual() const { |
return _internal_metadata_.arena(); |
@@ -688,13 +580,13 @@ class LIBPROTOBUF_EXPORT Enum : public ::google::protobuf::Message /* @@protoc_i |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
+ ::google::protobuf::Metadata GetMetadata() const; |
// nested types ---------------------------------------------------- |
// accessors ------------------------------------------------------- |
- // string name = 1; |
+ // optional string name = 1; |
void clear_name(); |
static const int kNameFieldNumber = 1; |
const ::std::string& name() const; |
@@ -704,9 +596,6 @@ class LIBPROTOBUF_EXPORT Enum : public ::google::protobuf::Message /* @@protoc_i |
::std::string* mutable_name(); |
::std::string* release_name(); |
void set_allocated_name(::std::string* name); |
- ::std::string* unsafe_arena_release_name(); |
- void unsafe_arena_set_allocated_name( |
- ::std::string* name); |
// repeated .google.protobuf.EnumValue enumvalue = 2; |
int enumvalue_size() const; |
@@ -732,23 +621,16 @@ class LIBPROTOBUF_EXPORT Enum : public ::google::protobuf::Message /* @@protoc_i |
const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& |
options() const; |
- // .google.protobuf.SourceContext source_context = 4; |
+ // optional .google.protobuf.SourceContext source_context = 4; |
bool has_source_context() const; |
void clear_source_context(); |
static const int kSourceContextFieldNumber = 4; |
- private: |
- void _slow_mutable_source_context(); |
- ::google::protobuf::SourceContext* _slow_release_source_context(); |
- public: |
const ::google::protobuf::SourceContext& source_context() const; |
::google::protobuf::SourceContext* mutable_source_context(); |
::google::protobuf::SourceContext* release_source_context(); |
void set_allocated_source_context(::google::protobuf::SourceContext* source_context); |
- ::google::protobuf::SourceContext* unsafe_arena_release_source_context(); |
- void unsafe_arena_set_allocated_source_context( |
- ::google::protobuf::SourceContext* source_context); |
- // .google.protobuf.Syntax syntax = 5; |
+ // optional .google.protobuf.Syntax syntax = 5; |
void clear_syntax(); |
static const int kSyntaxFieldNumber = 5; |
::google::protobuf::Syntax syntax() const; |
@@ -758,24 +640,23 @@ class LIBPROTOBUF_EXPORT Enum : public ::google::protobuf::Message /* @@protoc_i |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- friend class ::google::protobuf::Arena; |
- typedef void InternalArenaConstructable_; |
- typedef void DestructorSkippable_; |
+ bool _is_default_instance_; |
+ ::google::protobuf::internal::ArenaStringPtr name_; |
::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue > enumvalue_; |
::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; |
- ::google::protobuf::internal::ArenaStringPtr name_; |
::google::protobuf::SourceContext* source_context_; |
int syntax_; |
mutable int _cached_size_; |
- friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto_impl(); |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto_impl(); |
- friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2ftype_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto(); |
+ friend void protobuf_AssignDesc_google_2fprotobuf_2ftype_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2ftype_2eproto(); |
+ void InitAsDefaultInstance(); |
+ static Enum* default_instance_; |
}; |
// ------------------------------------------------------------------- |
-class LIBPROTOBUF_EXPORT EnumValue : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValue) */ { |
+class LIBPROTOBUF_EXPORT EnumValue : public ::google::protobuf::Message { |
public: |
EnumValue(); |
virtual ~EnumValue(); |
@@ -787,57 +668,35 @@ class LIBPROTOBUF_EXPORT EnumValue : public ::google::protobuf::Message /* @@pro |
return *this; |
} |
- inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL { |
- return GetArenaNoVirtual(); |
- } |
- inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL { |
- return MaybeArenaPtr(); |
- } |
static const ::google::protobuf::Descriptor* descriptor(); |
static const EnumValue& default_instance(); |
- static inline const EnumValue* internal_default_instance() { |
- return reinterpret_cast<const EnumValue*>( |
- &_EnumValue_default_instance_); |
- } |
- |
- void UnsafeArenaSwap(EnumValue* other); |
void Swap(EnumValue* other); |
// implements Message ---------------------------------------------- |
- inline EnumValue* New() const PROTOBUF_FINAL { return New(NULL); } |
+ inline EnumValue* New() const { return New(NULL); } |
- EnumValue* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; |
- void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
- void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
+ EnumValue* New(::google::protobuf::Arena* arena) const; |
+ void CopyFrom(const ::google::protobuf::Message& from); |
+ void MergeFrom(const ::google::protobuf::Message& from); |
void CopyFrom(const EnumValue& from); |
void MergeFrom(const EnumValue& from); |
- void Clear() PROTOBUF_FINAL; |
- bool IsInitialized() const PROTOBUF_FINAL; |
+ void Clear(); |
+ bool IsInitialized() const; |
- size_t ByteSizeLong() const PROTOBUF_FINAL; |
+ int ByteSize() const; |
bool MergePartialFromCodedStream( |
- ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; |
+ ::google::protobuf::io::CodedInputStream* input); |
void SerializeWithCachedSizes( |
- ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( |
- bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) |
- const PROTOBUF_FINAL { |
- return InternalSerializeWithCachedSizesToArray(false, output); |
- } |
- int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } |
+ ::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 PROTOBUF_FINAL; |
+ void SetCachedSize(int size) const; |
void InternalSwap(EnumValue* other); |
- protected: |
- explicit EnumValue(::google::protobuf::Arena* arena); |
- private: |
- static void ArenaDtor(void* object); |
- inline void RegisterArenaDtor(::google::protobuf::Arena* arena); |
private: |
inline ::google::protobuf::Arena* GetArenaNoVirtual() const { |
return _internal_metadata_.arena(); |
@@ -847,13 +706,13 @@ class LIBPROTOBUF_EXPORT EnumValue : public ::google::protobuf::Message /* @@pro |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
+ ::google::protobuf::Metadata GetMetadata() const; |
// nested types ---------------------------------------------------- |
// accessors ------------------------------------------------------- |
- // string name = 1; |
+ // optional string name = 1; |
void clear_name(); |
static const int kNameFieldNumber = 1; |
const ::std::string& name() const; |
@@ -863,11 +722,8 @@ class LIBPROTOBUF_EXPORT EnumValue : public ::google::protobuf::Message /* @@pro |
::std::string* mutable_name(); |
::std::string* release_name(); |
void set_allocated_name(::std::string* name); |
- ::std::string* unsafe_arena_release_name(); |
- void unsafe_arena_set_allocated_name( |
- ::std::string* name); |
- // int32 number = 2; |
+ // optional int32 number = 2; |
void clear_number(); |
static const int kNumberFieldNumber = 2; |
::google::protobuf::int32 number() const; |
@@ -889,22 +745,21 @@ class LIBPROTOBUF_EXPORT EnumValue : public ::google::protobuf::Message /* @@pro |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- friend class ::google::protobuf::Arena; |
- typedef void InternalArenaConstructable_; |
- typedef void DestructorSkippable_; |
- ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; |
+ bool _is_default_instance_; |
::google::protobuf::internal::ArenaStringPtr name_; |
+ ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; |
::google::protobuf::int32 number_; |
mutable int _cached_size_; |
- friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto_impl(); |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto_impl(); |
- friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2ftype_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto(); |
+ friend void protobuf_AssignDesc_google_2fprotobuf_2ftype_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2ftype_2eproto(); |
+ void InitAsDefaultInstance(); |
+ static EnumValue* default_instance_; |
}; |
// ------------------------------------------------------------------- |
-class LIBPROTOBUF_EXPORT Option : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Option) */ { |
+class LIBPROTOBUF_EXPORT Option : public ::google::protobuf::Message { |
public: |
Option(); |
virtual ~Option(); |
@@ -916,57 +771,35 @@ class LIBPROTOBUF_EXPORT Option : public ::google::protobuf::Message /* @@protoc |
return *this; |
} |
- inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL { |
- return GetArenaNoVirtual(); |
- } |
- inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL { |
- return MaybeArenaPtr(); |
- } |
static const ::google::protobuf::Descriptor* descriptor(); |
static const Option& default_instance(); |
- static inline const Option* internal_default_instance() { |
- return reinterpret_cast<const Option*>( |
- &_Option_default_instance_); |
- } |
- |
- void UnsafeArenaSwap(Option* other); |
void Swap(Option* other); |
// implements Message ---------------------------------------------- |
- inline Option* New() const PROTOBUF_FINAL { return New(NULL); } |
+ inline Option* New() const { return New(NULL); } |
- Option* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; |
- void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
- void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
+ Option* New(::google::protobuf::Arena* arena) const; |
+ void CopyFrom(const ::google::protobuf::Message& from); |
+ void MergeFrom(const ::google::protobuf::Message& from); |
void CopyFrom(const Option& from); |
void MergeFrom(const Option& from); |
- void Clear() PROTOBUF_FINAL; |
- bool IsInitialized() const PROTOBUF_FINAL; |
+ void Clear(); |
+ bool IsInitialized() const; |
- size_t ByteSizeLong() const PROTOBUF_FINAL; |
+ int ByteSize() const; |
bool MergePartialFromCodedStream( |
- ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; |
+ ::google::protobuf::io::CodedInputStream* input); |
void SerializeWithCachedSizes( |
- ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( |
- bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) |
- const PROTOBUF_FINAL { |
- return InternalSerializeWithCachedSizesToArray(false, output); |
- } |
- int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } |
+ ::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 PROTOBUF_FINAL; |
+ void SetCachedSize(int size) const; |
void InternalSwap(Option* other); |
- protected: |
- explicit Option(::google::protobuf::Arena* arena); |
- private: |
- static void ArenaDtor(void* object); |
- inline void RegisterArenaDtor(::google::protobuf::Arena* arena); |
private: |
inline ::google::protobuf::Arena* GetArenaNoVirtual() const { |
return _internal_metadata_.arena(); |
@@ -976,13 +809,13 @@ class LIBPROTOBUF_EXPORT Option : public ::google::protobuf::Message /* @@protoc |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
+ ::google::protobuf::Metadata GetMetadata() const; |
// nested types ---------------------------------------------------- |
// accessors ------------------------------------------------------- |
- // string name = 1; |
+ // optional string name = 1; |
void clear_name(); |
static const int kNameFieldNumber = 1; |
const ::std::string& name() const; |
@@ -992,41 +825,30 @@ class LIBPROTOBUF_EXPORT Option : public ::google::protobuf::Message /* @@protoc |
::std::string* mutable_name(); |
::std::string* release_name(); |
void set_allocated_name(::std::string* name); |
- ::std::string* unsafe_arena_release_name(); |
- void unsafe_arena_set_allocated_name( |
- ::std::string* name); |
- // .google.protobuf.Any value = 2; |
+ // optional .google.protobuf.Any value = 2; |
bool has_value() const; |
void clear_value(); |
static const int kValueFieldNumber = 2; |
- private: |
- void _slow_mutable_value(); |
- ::google::protobuf::Any* _slow_release_value(); |
- public: |
const ::google::protobuf::Any& value() const; |
::google::protobuf::Any* mutable_value(); |
::google::protobuf::Any* release_value(); |
void set_allocated_value(::google::protobuf::Any* value); |
- ::google::protobuf::Any* unsafe_arena_release_value(); |
- void unsafe_arena_set_allocated_value( |
- ::google::protobuf::Any* value); |
// @@protoc_insertion_point(class_scope:google.protobuf.Option) |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- friend class ::google::protobuf::Arena; |
- typedef void InternalArenaConstructable_; |
- typedef void DestructorSkippable_; |
+ bool _is_default_instance_; |
::google::protobuf::internal::ArenaStringPtr name_; |
::google::protobuf::Any* value_; |
mutable int _cached_size_; |
- friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto_impl(); |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto_impl(); |
- friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2ftype_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto(); |
+ friend void protobuf_AssignDesc_google_2fprotobuf_2ftype_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2ftype_2eproto(); |
+ void InitAsDefaultInstance(); |
+ static Option* default_instance_; |
}; |
// =================================================================== |
@@ -1036,48 +858,39 @@ class LIBPROTOBUF_EXPORT Option : public ::google::protobuf::Message /* @@protoc |
#if !PROTOBUF_INLINE_NOT_IN_HEADERS |
// Type |
-// string name = 1; |
+// optional string name = 1; |
inline void Type::clear_name() { |
- name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Type::name() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Type.name) |
- return name_.Get(); |
+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Type::set_name(const ::std::string& value) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); |
// @@protoc_insertion_point(field_set:google.protobuf.Type.name) |
} |
inline void Type::set_name(const char* value) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), |
- GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); |
// @@protoc_insertion_point(field_set_char:google.protobuf.Type.name) |
} |
-inline void Type::set_name(const char* value, |
- size_t size) { |
+inline void Type::set_name(const char* value, size_t size) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( |
- reinterpret_cast<const char*>(value), size), GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
+ ::std::string(reinterpret_cast<const char*>(value), size)); |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.Type.name) |
} |
inline ::std::string* Type::mutable_name() { |
// @@protoc_insertion_point(field_mutable:google.protobuf.Type.name) |
- return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline ::std::string* Type::release_name() { |
// @@protoc_insertion_point(field_release:google.protobuf.Type.name) |
- return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
-} |
-inline ::std::string* Type::unsafe_arena_release_name() { |
- // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Type.name) |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- |
- return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- GetArenaNoVirtual()); |
+ return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Type::set_allocated_name(::std::string* name) { |
if (name != NULL) { |
@@ -1085,22 +898,9 @@ inline void Type::set_allocated_name(::std::string* name) { |
} else { |
} |
- name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name, |
- GetArenaNoVirtual()); |
+ name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Type.name) |
} |
-inline void Type::unsafe_arena_set_allocated_name( |
- ::std::string* name) { |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- if (name != NULL) { |
- |
- } else { |
- |
- } |
- name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- name, GetArenaNoVirtual()); |
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Type.name) |
-} |
// repeated .google.protobuf.Field fields = 2; |
inline int Type::fields_size() const { |
@@ -1217,9 +1017,9 @@ Type::options() const { |
return options_; |
} |
-// .google.protobuf.SourceContext source_context = 5; |
+// optional .google.protobuf.SourceContext source_context = 5; |
inline bool Type::has_source_context() const { |
- return this != internal_default_instance() && source_context_ != NULL; |
+ return !_is_default_instance_ && source_context_ != NULL; |
} |
inline void Type::clear_source_context() { |
if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_; |
@@ -1227,13 +1027,12 @@ inline void Type::clear_source_context() { |
} |
inline const ::google::protobuf::SourceContext& Type::source_context() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Type.source_context) |
- return source_context_ != NULL ? *source_context_ |
- : *::google::protobuf::SourceContext::internal_default_instance(); |
+ return source_context_ != NULL ? *source_context_ : *default_instance_->source_context_; |
} |
inline ::google::protobuf::SourceContext* Type::mutable_source_context() { |
if (source_context_ == NULL) { |
- _slow_mutable_source_context(); |
+ source_context_ = new ::google::protobuf::SourceContext; |
} |
// @@protoc_insertion_point(field_mutable:google.protobuf.Type.source_context) |
return source_context_; |
@@ -1241,24 +1040,12 @@ inline ::google::protobuf::SourceContext* Type::mutable_source_context() { |
inline ::google::protobuf::SourceContext* Type::release_source_context() { |
// @@protoc_insertion_point(field_release:google.protobuf.Type.source_context) |
- if (GetArenaNoVirtual() != NULL) { |
- return _slow_release_source_context(); |
- } else { |
- ::google::protobuf::SourceContext* temp = source_context_; |
- source_context_ = NULL; |
- return temp; |
- } |
+ ::google::protobuf::SourceContext* temp = source_context_; |
+ source_context_ = NULL; |
+ return temp; |
} |
-inline void Type::set_allocated_source_context(::google::protobuf::SourceContext* source_context) { |
- ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); |
- if (message_arena == NULL) { |
- delete source_context_; |
- } |
- if (source_context != NULL) { |
- if (message_arena != NULL) { |
- message_arena->Own(source_context); |
- } |
- } |
+inline void Type::set_allocated_source_context(::google::protobuf::SourceContext* source_context) { |
+ delete source_context_; |
source_context_ = source_context; |
if (source_context) { |
@@ -1268,7 +1055,7 @@ inline void Type::set_allocated_source_context(::google::protobuf::SourceContex |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Type.source_context) |
} |
-// .google.protobuf.Syntax syntax = 6; |
+// optional .google.protobuf.Syntax syntax = 6; |
inline void Type::clear_syntax() { |
syntax_ = 0; |
} |
@@ -1286,7 +1073,7 @@ inline void Type::set_syntax(::google::protobuf::Syntax value) { |
// Field |
-// .google.protobuf.Field.Kind kind = 1; |
+// optional .google.protobuf.Field.Kind kind = 1; |
inline void Field::clear_kind() { |
kind_ = 0; |
} |
@@ -1300,7 +1087,7 @@ inline void Field::set_kind(::google::protobuf::Field_Kind value) { |
// @@protoc_insertion_point(field_set:google.protobuf.Field.kind) |
} |
-// .google.protobuf.Field.Cardinality cardinality = 2; |
+// optional .google.protobuf.Field.Cardinality cardinality = 2; |
inline void Field::clear_cardinality() { |
cardinality_ = 0; |
} |
@@ -1314,7 +1101,7 @@ inline void Field::set_cardinality(::google::protobuf::Field_Cardinality value) |
// @@protoc_insertion_point(field_set:google.protobuf.Field.cardinality) |
} |
-// int32 number = 3; |
+// optional int32 number = 3; |
inline void Field::clear_number() { |
number_ = 0; |
} |
@@ -1328,48 +1115,39 @@ inline void Field::set_number(::google::protobuf::int32 value) { |
// @@protoc_insertion_point(field_set:google.protobuf.Field.number) |
} |
-// string name = 4; |
+// optional string name = 4; |
inline void Field::clear_name() { |
- name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Field::name() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Field.name) |
- return name_.Get(); |
+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Field::set_name(const ::std::string& value) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); |
// @@protoc_insertion_point(field_set:google.protobuf.Field.name) |
} |
inline void Field::set_name(const char* value) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), |
- GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); |
// @@protoc_insertion_point(field_set_char:google.protobuf.Field.name) |
} |
-inline void Field::set_name(const char* value, |
- size_t size) { |
+inline void Field::set_name(const char* value, size_t size) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( |
- reinterpret_cast<const char*>(value), size), GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
+ ::std::string(reinterpret_cast<const char*>(value), size)); |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.Field.name) |
} |
inline ::std::string* Field::mutable_name() { |
// @@protoc_insertion_point(field_mutable:google.protobuf.Field.name) |
- return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline ::std::string* Field::release_name() { |
// @@protoc_insertion_point(field_release:google.protobuf.Field.name) |
- return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
-} |
-inline ::std::string* Field::unsafe_arena_release_name() { |
- // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Field.name) |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- |
- return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- GetArenaNoVirtual()); |
+ return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Field::set_allocated_name(::std::string* name) { |
if (name != NULL) { |
@@ -1377,65 +1155,43 @@ inline void Field::set_allocated_name(::std::string* name) { |
} else { |
} |
- name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name, |
- GetArenaNoVirtual()); |
+ name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.name) |
} |
-inline void Field::unsafe_arena_set_allocated_name( |
- ::std::string* name) { |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- if (name != NULL) { |
- |
- } else { |
- |
- } |
- name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- name, GetArenaNoVirtual()); |
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Field.name) |
-} |
-// string type_url = 6; |
+// optional string type_url = 6; |
inline void Field::clear_type_url() { |
- type_url_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Field::type_url() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Field.type_url) |
- return type_url_.Get(); |
+ return type_url_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Field::set_type_url(const ::std::string& value) { |
- type_url_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); |
+ type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); |
// @@protoc_insertion_point(field_set:google.protobuf.Field.type_url) |
} |
inline void Field::set_type_url(const char* value) { |
- type_url_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), |
- GetArenaNoVirtual()); |
+ type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); |
// @@protoc_insertion_point(field_set_char:google.protobuf.Field.type_url) |
} |
-inline void Field::set_type_url(const char* value, |
- size_t size) { |
+inline void Field::set_type_url(const char* value, size_t size) { |
- type_url_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( |
- reinterpret_cast<const char*>(value), size), GetArenaNoVirtual()); |
+ type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
+ ::std::string(reinterpret_cast<const char*>(value), size)); |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.Field.type_url) |
} |
inline ::std::string* Field::mutable_type_url() { |
// @@protoc_insertion_point(field_mutable:google.protobuf.Field.type_url) |
- return type_url_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ return type_url_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline ::std::string* Field::release_type_url() { |
// @@protoc_insertion_point(field_release:google.protobuf.Field.type_url) |
- return type_url_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
-} |
-inline ::std::string* Field::unsafe_arena_release_type_url() { |
- // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Field.type_url) |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- |
- return type_url_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- GetArenaNoVirtual()); |
+ return type_url_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Field::set_allocated_type_url(::std::string* type_url) { |
if (type_url != NULL) { |
@@ -1443,24 +1199,11 @@ inline void Field::set_allocated_type_url(::std::string* type_url) { |
} else { |
} |
- type_url_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), type_url, |
- GetArenaNoVirtual()); |
+ type_url_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), type_url); |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.type_url) |
} |
-inline void Field::unsafe_arena_set_allocated_type_url( |
- ::std::string* type_url) { |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- if (type_url != NULL) { |
- |
- } else { |
- |
- } |
- type_url_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- type_url, GetArenaNoVirtual()); |
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Field.type_url) |
-} |
-// int32 oneof_index = 7; |
+// optional int32 oneof_index = 7; |
inline void Field::clear_oneof_index() { |
oneof_index_ = 0; |
} |
@@ -1474,7 +1217,7 @@ inline void Field::set_oneof_index(::google::protobuf::int32 value) { |
// @@protoc_insertion_point(field_set:google.protobuf.Field.oneof_index) |
} |
-// bool packed = 8; |
+// optional bool packed = 8; |
inline void Field::clear_packed() { |
packed_ = false; |
} |
@@ -1518,48 +1261,39 @@ Field::options() const { |
return options_; |
} |
-// string json_name = 10; |
+// optional string json_name = 10; |
inline void Field::clear_json_name() { |
- json_name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ json_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Field::json_name() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Field.json_name) |
- return json_name_.Get(); |
+ return json_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Field::set_json_name(const ::std::string& value) { |
- json_name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); |
+ json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); |
// @@protoc_insertion_point(field_set:google.protobuf.Field.json_name) |
} |
inline void Field::set_json_name(const char* value) { |
- json_name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), |
- GetArenaNoVirtual()); |
+ json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); |
// @@protoc_insertion_point(field_set_char:google.protobuf.Field.json_name) |
} |
-inline void Field::set_json_name(const char* value, |
- size_t size) { |
+inline void Field::set_json_name(const char* value, size_t size) { |
- json_name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( |
- reinterpret_cast<const char*>(value), size), GetArenaNoVirtual()); |
+ json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
+ ::std::string(reinterpret_cast<const char*>(value), size)); |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.Field.json_name) |
} |
inline ::std::string* Field::mutable_json_name() { |
// @@protoc_insertion_point(field_mutable:google.protobuf.Field.json_name) |
- return json_name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ return json_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline ::std::string* Field::release_json_name() { |
// @@protoc_insertion_point(field_release:google.protobuf.Field.json_name) |
- return json_name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
-} |
-inline ::std::string* Field::unsafe_arena_release_json_name() { |
- // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Field.json_name) |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- |
- return json_name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- GetArenaNoVirtual()); |
+ return json_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Field::set_allocated_json_name(::std::string* json_name) { |
if (json_name != NULL) { |
@@ -1567,65 +1301,43 @@ inline void Field::set_allocated_json_name(::std::string* json_name) { |
} else { |
} |
- json_name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), json_name, |
- GetArenaNoVirtual()); |
+ json_name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), json_name); |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.json_name) |
} |
-inline void Field::unsafe_arena_set_allocated_json_name( |
- ::std::string* json_name) { |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- if (json_name != NULL) { |
- |
- } else { |
- |
- } |
- json_name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- json_name, GetArenaNoVirtual()); |
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Field.json_name) |
-} |
-// string default_value = 11; |
+// optional string default_value = 11; |
inline void Field::clear_default_value() { |
- default_value_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Field::default_value() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Field.default_value) |
- return default_value_.Get(); |
+ return default_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Field::set_default_value(const ::std::string& value) { |
- default_value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); |
+ default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); |
// @@protoc_insertion_point(field_set:google.protobuf.Field.default_value) |
} |
inline void Field::set_default_value(const char* value) { |
- default_value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), |
- GetArenaNoVirtual()); |
+ default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); |
// @@protoc_insertion_point(field_set_char:google.protobuf.Field.default_value) |
} |
-inline void Field::set_default_value(const char* value, |
- size_t size) { |
+inline void Field::set_default_value(const char* value, size_t size) { |
- default_value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( |
- reinterpret_cast<const char*>(value), size), GetArenaNoVirtual()); |
+ default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
+ ::std::string(reinterpret_cast<const char*>(value), size)); |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.Field.default_value) |
} |
inline ::std::string* Field::mutable_default_value() { |
// @@protoc_insertion_point(field_mutable:google.protobuf.Field.default_value) |
- return default_value_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ return default_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline ::std::string* Field::release_default_value() { |
// @@protoc_insertion_point(field_release:google.protobuf.Field.default_value) |
- return default_value_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
-} |
-inline ::std::string* Field::unsafe_arena_release_default_value() { |
- // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Field.default_value) |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- |
- return default_value_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- GetArenaNoVirtual()); |
+ return default_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Field::set_allocated_default_value(::std::string* default_value) { |
if (default_value != NULL) { |
@@ -1633,69 +1345,47 @@ inline void Field::set_allocated_default_value(::std::string* default_value) { |
} else { |
} |
- default_value_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), default_value, |
- GetArenaNoVirtual()); |
+ default_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), default_value); |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.default_value) |
} |
-inline void Field::unsafe_arena_set_allocated_default_value( |
- ::std::string* default_value) { |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- if (default_value != NULL) { |
- |
- } else { |
- |
- } |
- default_value_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- default_value, GetArenaNoVirtual()); |
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Field.default_value) |
-} |
// ------------------------------------------------------------------- |
// Enum |
-// string name = 1; |
+// optional string name = 1; |
inline void Enum::clear_name() { |
- name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Enum::name() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Enum.name) |
- return name_.Get(); |
+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Enum::set_name(const ::std::string& value) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); |
// @@protoc_insertion_point(field_set:google.protobuf.Enum.name) |
} |
inline void Enum::set_name(const char* value) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), |
- GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); |
// @@protoc_insertion_point(field_set_char:google.protobuf.Enum.name) |
} |
-inline void Enum::set_name(const char* value, |
- size_t size) { |
+inline void Enum::set_name(const char* value, size_t size) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( |
- reinterpret_cast<const char*>(value), size), GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
+ ::std::string(reinterpret_cast<const char*>(value), size)); |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.Enum.name) |
} |
inline ::std::string* Enum::mutable_name() { |
// @@protoc_insertion_point(field_mutable:google.protobuf.Enum.name) |
- return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline ::std::string* Enum::release_name() { |
// @@protoc_insertion_point(field_release:google.protobuf.Enum.name) |
- return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
-} |
-inline ::std::string* Enum::unsafe_arena_release_name() { |
- // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Enum.name) |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- |
- return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- GetArenaNoVirtual()); |
+ return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Enum::set_allocated_name(::std::string* name) { |
if (name != NULL) { |
@@ -1703,22 +1393,9 @@ inline void Enum::set_allocated_name(::std::string* name) { |
} else { |
} |
- name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name, |
- GetArenaNoVirtual()); |
+ name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Enum.name) |
} |
-inline void Enum::unsafe_arena_set_allocated_name( |
- ::std::string* name) { |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- if (name != NULL) { |
- |
- } else { |
- |
- } |
- name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- name, GetArenaNoVirtual()); |
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Enum.name) |
-} |
// repeated .google.protobuf.EnumValue enumvalue = 2; |
inline int Enum::enumvalue_size() const { |
@@ -1780,9 +1457,9 @@ Enum::options() const { |
return options_; |
} |
-// .google.protobuf.SourceContext source_context = 4; |
+// optional .google.protobuf.SourceContext source_context = 4; |
inline bool Enum::has_source_context() const { |
- return this != internal_default_instance() && source_context_ != NULL; |
+ return !_is_default_instance_ && source_context_ != NULL; |
} |
inline void Enum::clear_source_context() { |
if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_; |
@@ -1790,13 +1467,12 @@ inline void Enum::clear_source_context() { |
} |
inline const ::google::protobuf::SourceContext& Enum::source_context() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Enum.source_context) |
- return source_context_ != NULL ? *source_context_ |
- : *::google::protobuf::SourceContext::internal_default_instance(); |
+ return source_context_ != NULL ? *source_context_ : *default_instance_->source_context_; |
} |
inline ::google::protobuf::SourceContext* Enum::mutable_source_context() { |
if (source_context_ == NULL) { |
- _slow_mutable_source_context(); |
+ source_context_ = new ::google::protobuf::SourceContext; |
} |
// @@protoc_insertion_point(field_mutable:google.protobuf.Enum.source_context) |
return source_context_; |
@@ -1804,24 +1480,12 @@ inline ::google::protobuf::SourceContext* Enum::mutable_source_context() { |
inline ::google::protobuf::SourceContext* Enum::release_source_context() { |
// @@protoc_insertion_point(field_release:google.protobuf.Enum.source_context) |
- if (GetArenaNoVirtual() != NULL) { |
- return _slow_release_source_context(); |
- } else { |
- ::google::protobuf::SourceContext* temp = source_context_; |
- source_context_ = NULL; |
- return temp; |
- } |
+ ::google::protobuf::SourceContext* temp = source_context_; |
+ source_context_ = NULL; |
+ return temp; |
} |
-inline void Enum::set_allocated_source_context(::google::protobuf::SourceContext* source_context) { |
- ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); |
- if (message_arena == NULL) { |
- delete source_context_; |
- } |
- if (source_context != NULL) { |
- if (message_arena != NULL) { |
- message_arena->Own(source_context); |
- } |
- } |
+inline void Enum::set_allocated_source_context(::google::protobuf::SourceContext* source_context) { |
+ delete source_context_; |
source_context_ = source_context; |
if (source_context) { |
@@ -1831,7 +1495,7 @@ inline void Enum::set_allocated_source_context(::google::protobuf::SourceContex |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Enum.source_context) |
} |
-// .google.protobuf.Syntax syntax = 5; |
+// optional .google.protobuf.Syntax syntax = 5; |
inline void Enum::clear_syntax() { |
syntax_ = 0; |
} |
@@ -1849,48 +1513,39 @@ inline void Enum::set_syntax(::google::protobuf::Syntax value) { |
// EnumValue |
-// string name = 1; |
+// optional string name = 1; |
inline void EnumValue::clear_name() { |
- name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& EnumValue::name() const { |
// @@protoc_insertion_point(field_get:google.protobuf.EnumValue.name) |
- return name_.Get(); |
+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void EnumValue::set_name(const ::std::string& value) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); |
// @@protoc_insertion_point(field_set:google.protobuf.EnumValue.name) |
} |
inline void EnumValue::set_name(const char* value) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), |
- GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); |
// @@protoc_insertion_point(field_set_char:google.protobuf.EnumValue.name) |
} |
-inline void EnumValue::set_name(const char* value, |
- size_t size) { |
+inline void EnumValue::set_name(const char* value, size_t size) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( |
- reinterpret_cast<const char*>(value), size), GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
+ ::std::string(reinterpret_cast<const char*>(value), size)); |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.EnumValue.name) |
} |
inline ::std::string* EnumValue::mutable_name() { |
// @@protoc_insertion_point(field_mutable:google.protobuf.EnumValue.name) |
- return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline ::std::string* EnumValue::release_name() { |
// @@protoc_insertion_point(field_release:google.protobuf.EnumValue.name) |
- return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
-} |
-inline ::std::string* EnumValue::unsafe_arena_release_name() { |
- // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.EnumValue.name) |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- |
- return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- GetArenaNoVirtual()); |
+ return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void EnumValue::set_allocated_name(::std::string* name) { |
if (name != NULL) { |
@@ -1898,24 +1553,11 @@ inline void EnumValue::set_allocated_name(::std::string* name) { |
} else { |
} |
- name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name, |
- GetArenaNoVirtual()); |
+ name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValue.name) |
} |
-inline void EnumValue::unsafe_arena_set_allocated_name( |
- ::std::string* name) { |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- if (name != NULL) { |
- |
- } else { |
- |
- } |
- name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- name, GetArenaNoVirtual()); |
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.EnumValue.name) |
-} |
-// int32 number = 2; |
+// optional int32 number = 2; |
inline void EnumValue::clear_number() { |
number_ = 0; |
} |
@@ -1963,48 +1605,39 @@ EnumValue::options() const { |
// Option |
-// string name = 1; |
+// optional string name = 1; |
inline void Option::clear_name() { |
- name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Option::name() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Option.name) |
- return name_.Get(); |
+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Option::set_name(const ::std::string& value) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); |
// @@protoc_insertion_point(field_set:google.protobuf.Option.name) |
} |
inline void Option::set_name(const char* value) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), |
- GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); |
// @@protoc_insertion_point(field_set_char:google.protobuf.Option.name) |
} |
-inline void Option::set_name(const char* value, |
- size_t size) { |
+inline void Option::set_name(const char* value, size_t size) { |
- name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( |
- reinterpret_cast<const char*>(value), size), GetArenaNoVirtual()); |
+ name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
+ ::std::string(reinterpret_cast<const char*>(value), size)); |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.Option.name) |
} |
inline ::std::string* Option::mutable_name() { |
// @@protoc_insertion_point(field_mutable:google.protobuf.Option.name) |
- return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline ::std::string* Option::release_name() { |
// @@protoc_insertion_point(field_release:google.protobuf.Option.name) |
- return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
-} |
-inline ::std::string* Option::unsafe_arena_release_name() { |
- // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Option.name) |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- |
- return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- GetArenaNoVirtual()); |
+ return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline void Option::set_allocated_name(::std::string* name) { |
if (name != NULL) { |
@@ -2012,26 +1645,13 @@ inline void Option::set_allocated_name(::std::string* name) { |
} else { |
} |
- name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name, |
- GetArenaNoVirtual()); |
+ name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Option.name) |
} |
-inline void Option::unsafe_arena_set_allocated_name( |
- ::std::string* name) { |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- if (name != NULL) { |
- |
- } else { |
- |
- } |
- name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- name, GetArenaNoVirtual()); |
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Option.name) |
-} |
-// .google.protobuf.Any value = 2; |
+// optional .google.protobuf.Any value = 2; |
inline bool Option::has_value() const { |
- return this != internal_default_instance() && value_ != NULL; |
+ return !_is_default_instance_ && value_ != NULL; |
} |
inline void Option::clear_value() { |
if (GetArenaNoVirtual() == NULL && value_ != NULL) delete value_; |
@@ -2039,13 +1659,12 @@ inline void Option::clear_value() { |
} |
inline const ::google::protobuf::Any& Option::value() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Option.value) |
- return value_ != NULL ? *value_ |
- : *::google::protobuf::Any::internal_default_instance(); |
+ return value_ != NULL ? *value_ : *default_instance_->value_; |
} |
inline ::google::protobuf::Any* Option::mutable_value() { |
if (value_ == NULL) { |
- _slow_mutable_value(); |
+ value_ = new ::google::protobuf::Any; |
} |
// @@protoc_insertion_point(field_mutable:google.protobuf.Option.value) |
return value_; |
@@ -2053,24 +1672,12 @@ inline ::google::protobuf::Any* Option::mutable_value() { |
inline ::google::protobuf::Any* Option::release_value() { |
// @@protoc_insertion_point(field_release:google.protobuf.Option.value) |
- if (GetArenaNoVirtual() != NULL) { |
- return _slow_release_value(); |
- } else { |
- ::google::protobuf::Any* temp = value_; |
- value_ = NULL; |
- return temp; |
- } |
+ ::google::protobuf::Any* temp = value_; |
+ value_ = NULL; |
+ return temp; |
} |
-inline void Option::set_allocated_value(::google::protobuf::Any* value) { |
- ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); |
- if (message_arena == NULL) { |
- delete value_; |
- } |
- if (value != NULL) { |
- if (message_arena != NULL) { |
- message_arena->Own(value); |
- } |
- } |
+inline void Option::set_allocated_value(::google::protobuf::Any* value) { |
+ delete value_; |
value_ = value; |
if (value) { |
@@ -2092,7 +1699,6 @@ inline void Option::set_allocated_value(::google::protobuf::Any* value) { |
// @@protoc_insertion_point(namespace_scope) |
- |
} // namespace protobuf |
} // namespace google |