Index: third_party/protobuf/src/google/protobuf/struct.pb.h |
diff --git a/third_party/protobuf/src/google/protobuf/struct.pb.h b/third_party/protobuf/src/google/protobuf/struct.pb.h |
index 1037d84c35ee8d809de1e4ccf7a5b722b632d1f3..6a4764a7f342c88f1af21270486994f718e77f6a 100644 |
--- a/third_party/protobuf/src/google/protobuf/struct.pb.h |
+++ b/third_party/protobuf/src/google/protobuf/struct.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,33 +24,25 @@ |
#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/map.h> |
#include <google/protobuf/map_field_inl.h> |
#include <google/protobuf/generated_enum_reflection.h> |
#include <google/protobuf/unknown_field_set.h> |
// @@protoc_insertion_point(includes) |
-namespace google { |
-namespace protobuf { |
-class ListValue; |
-class ListValueDefaultTypeInternal; |
-LIBPROTOBUF_EXPORT extern ListValueDefaultTypeInternal _ListValue_default_instance_; |
-class Struct; |
-class StructDefaultTypeInternal; |
-LIBPROTOBUF_EXPORT extern StructDefaultTypeInternal _Struct_default_instance_; |
-class Value; |
-class ValueDefaultTypeInternal; |
-LIBPROTOBUF_EXPORT extern ValueDefaultTypeInternal _Value_default_instance_; |
-} // namespace protobuf |
-} // namespace google |
namespace google { |
namespace protobuf { |
// Internal implementation detail -- do not call these. |
void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fstruct_2eproto(); |
-void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fstruct_2eproto(); |
+void protobuf_AssignDesc_google_2fprotobuf_2fstruct_2eproto(); |
+void protobuf_ShutdownFile_google_2fprotobuf_2fstruct_2eproto(); |
+ |
+class ListValue; |
+class Struct; |
+class Value; |
enum NullValue { |
NULL_VALUE = 0, |
@@ -74,10 +66,7 @@ inline bool NullValue_Parse( |
} |
// =================================================================== |
- |
-// ------------------------------------------------------------------- |
- |
-class LIBPROTOBUF_EXPORT Struct : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Struct) */ { |
+class LIBPROTOBUF_EXPORT Struct : public ::google::protobuf::Message { |
public: |
Struct(); |
virtual ~Struct(); |
@@ -89,57 +78,35 @@ class LIBPROTOBUF_EXPORT Struct : 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 Struct& default_instance(); |
- static inline const Struct* internal_default_instance() { |
- return reinterpret_cast<const Struct*>( |
- &_Struct_default_instance_); |
- } |
- |
- void UnsafeArenaSwap(Struct* other); |
void Swap(Struct* other); |
// implements Message ---------------------------------------------- |
- inline Struct* New() const PROTOBUF_FINAL { return New(NULL); } |
+ inline Struct* New() const { return New(NULL); } |
- Struct* 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; |
+ Struct* New(::google::protobuf::Arena* arena) const; |
+ void CopyFrom(const ::google::protobuf::Message& from); |
+ void MergeFrom(const ::google::protobuf::Message& from); |
void CopyFrom(const Struct& from); |
void MergeFrom(const Struct& 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(Struct* other); |
- protected: |
- explicit Struct(::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(); |
@@ -149,7 +116,7 @@ class LIBPROTOBUF_EXPORT Struct : public ::google::protobuf::Message /* @@protoc |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
+ ::google::protobuf::Metadata GetMetadata() const; |
// nested types ---------------------------------------------------- |
@@ -169,9 +136,7 @@ class LIBPROTOBUF_EXPORT Struct : public ::google::protobuf::Message /* @@protoc |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- friend class ::google::protobuf::Arena; |
- typedef void InternalArenaConstructable_; |
- typedef void DestructorSkippable_; |
+ bool _is_default_instance_; |
typedef ::google::protobuf::internal::MapEntryLite< |
::std::string, ::google::protobuf::Value, |
::google::protobuf::internal::WireFormatLite::TYPE_STRING, |
@@ -184,15 +149,16 @@ class LIBPROTOBUF_EXPORT Struct : public ::google::protobuf::Message /* @@protoc |
::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, |
0 > fields_; |
mutable int _cached_size_; |
- friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fstruct_2eproto_impl(); |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fstruct_2eproto_impl(); |
- friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fstruct_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fstruct_2eproto(); |
+ friend void protobuf_AssignDesc_google_2fprotobuf_2fstruct_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2fstruct_2eproto(); |
+ void InitAsDefaultInstance(); |
+ static Struct* default_instance_; |
}; |
// ------------------------------------------------------------------- |
-class LIBPROTOBUF_EXPORT Value : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Value) */ { |
+class LIBPROTOBUF_EXPORT Value : public ::google::protobuf::Message { |
public: |
Value(); |
virtual ~Value(); |
@@ -204,12 +170,6 @@ class LIBPROTOBUF_EXPORT Value : 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 Value& default_instance(); |
@@ -223,48 +183,32 @@ class LIBPROTOBUF_EXPORT Value : public ::google::protobuf::Message /* @@protoc_ |
KIND_NOT_SET = 0, |
}; |
- static inline const Value* internal_default_instance() { |
- return reinterpret_cast<const Value*>( |
- &_Value_default_instance_); |
- } |
- |
- void UnsafeArenaSwap(Value* other); |
void Swap(Value* other); |
// implements Message ---------------------------------------------- |
- inline Value* New() const PROTOBUF_FINAL { return New(NULL); } |
+ inline Value* New() const { return New(NULL); } |
- Value* 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; |
+ Value* New(::google::protobuf::Arena* arena) const; |
+ void CopyFrom(const ::google::protobuf::Message& from); |
+ void MergeFrom(const ::google::protobuf::Message& from); |
void CopyFrom(const Value& from); |
void MergeFrom(const Value& 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(Value* other); |
- protected: |
- explicit Value(::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(); |
@@ -274,13 +218,13 @@ class LIBPROTOBUF_EXPORT Value : public ::google::protobuf::Message /* @@protoc_ |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
+ ::google::protobuf::Metadata GetMetadata() const; |
// nested types ---------------------------------------------------- |
// accessors ------------------------------------------------------- |
- // .google.protobuf.NullValue null_value = 1; |
+ // optional .google.protobuf.NullValue null_value = 1; |
private: |
bool has_null_value() const; |
public: |
@@ -289,7 +233,7 @@ class LIBPROTOBUF_EXPORT Value : public ::google::protobuf::Message /* @@protoc_ |
::google::protobuf::NullValue null_value() const; |
void set_null_value(::google::protobuf::NullValue value); |
- // double number_value = 2; |
+ // optional double number_value = 2; |
private: |
bool has_number_value() const; |
public: |
@@ -298,7 +242,7 @@ class LIBPROTOBUF_EXPORT Value : public ::google::protobuf::Message /* @@protoc_ |
double number_value() const; |
void set_number_value(double value); |
- // string string_value = 3; |
+ // optional string string_value = 3; |
private: |
bool has_string_value() const; |
public: |
@@ -311,11 +255,8 @@ class LIBPROTOBUF_EXPORT Value : public ::google::protobuf::Message /* @@protoc_ |
::std::string* mutable_string_value(); |
::std::string* release_string_value(); |
void set_allocated_string_value(::std::string* string_value); |
- ::std::string* unsafe_arena_release_string_value(); |
- void unsafe_arena_set_allocated_string_value( |
- ::std::string* string_value); |
- // bool bool_value = 4; |
+ // optional bool bool_value = 4; |
private: |
bool has_bool_value() const; |
public: |
@@ -324,60 +265,40 @@ class LIBPROTOBUF_EXPORT Value : public ::google::protobuf::Message /* @@protoc_ |
bool bool_value() const; |
void set_bool_value(bool value); |
- // .google.protobuf.Struct struct_value = 5; |
+ // optional .google.protobuf.Struct struct_value = 5; |
bool has_struct_value() const; |
void clear_struct_value(); |
static const int kStructValueFieldNumber = 5; |
- private: |
- void _slow_mutable_struct_value(); |
- void _slow_set_allocated_struct_value( |
- ::google::protobuf::Arena* message_arena, ::google::protobuf::Struct** struct_value); |
- ::google::protobuf::Struct* _slow_release_struct_value(); |
- public: |
const ::google::protobuf::Struct& struct_value() const; |
::google::protobuf::Struct* mutable_struct_value(); |
::google::protobuf::Struct* release_struct_value(); |
void set_allocated_struct_value(::google::protobuf::Struct* struct_value); |
- ::google::protobuf::Struct* unsafe_arena_release_struct_value(); |
- void unsafe_arena_set_allocated_struct_value( |
- ::google::protobuf::Struct* struct_value); |
- // .google.protobuf.ListValue list_value = 6; |
+ // optional .google.protobuf.ListValue list_value = 6; |
bool has_list_value() const; |
void clear_list_value(); |
static const int kListValueFieldNumber = 6; |
- private: |
- void _slow_mutable_list_value(); |
- void _slow_set_allocated_list_value( |
- ::google::protobuf::Arena* message_arena, ::google::protobuf::ListValue** list_value); |
- ::google::protobuf::ListValue* _slow_release_list_value(); |
- public: |
const ::google::protobuf::ListValue& list_value() const; |
::google::protobuf::ListValue* mutable_list_value(); |
::google::protobuf::ListValue* release_list_value(); |
void set_allocated_list_value(::google::protobuf::ListValue* list_value); |
- ::google::protobuf::ListValue* unsafe_arena_release_list_value(); |
- void unsafe_arena_set_allocated_list_value( |
- ::google::protobuf::ListValue* list_value); |
KindCase kind_case() const; |
// @@protoc_insertion_point(class_scope:google.protobuf.Value) |
private: |
- void set_has_null_value(); |
- void set_has_number_value(); |
- void set_has_string_value(); |
- void set_has_bool_value(); |
- void set_has_struct_value(); |
- void set_has_list_value(); |
+ inline void set_has_null_value(); |
+ inline void set_has_number_value(); |
+ inline void set_has_string_value(); |
+ inline void set_has_bool_value(); |
+ inline void set_has_struct_value(); |
+ inline void set_has_list_value(); |
inline bool has_kind() const; |
void clear_kind(); |
inline void clear_has_kind(); |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- friend class ::google::protobuf::Arena; |
- typedef void InternalArenaConstructable_; |
- typedef void DestructorSkippable_; |
+ bool _is_default_instance_; |
union KindUnion { |
KindUnion() {} |
int null_value_; |
@@ -390,15 +311,16 @@ class LIBPROTOBUF_EXPORT Value : public ::google::protobuf::Message /* @@protoc_ |
mutable int _cached_size_; |
::google::protobuf::uint32 _oneof_case_[1]; |
- friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fstruct_2eproto_impl(); |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fstruct_2eproto_impl(); |
- friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fstruct_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fstruct_2eproto(); |
+ friend void protobuf_AssignDesc_google_2fprotobuf_2fstruct_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2fstruct_2eproto(); |
+ void InitAsDefaultInstance(); |
+ static Value* default_instance_; |
}; |
// ------------------------------------------------------------------- |
-class LIBPROTOBUF_EXPORT ListValue : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ListValue) */ { |
+class LIBPROTOBUF_EXPORT ListValue : public ::google::protobuf::Message { |
public: |
ListValue(); |
virtual ~ListValue(); |
@@ -410,57 +332,35 @@ class LIBPROTOBUF_EXPORT ListValue : 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 ListValue& default_instance(); |
- static inline const ListValue* internal_default_instance() { |
- return reinterpret_cast<const ListValue*>( |
- &_ListValue_default_instance_); |
- } |
- |
- void UnsafeArenaSwap(ListValue* other); |
void Swap(ListValue* other); |
// implements Message ---------------------------------------------- |
- inline ListValue* New() const PROTOBUF_FINAL { return New(NULL); } |
+ inline ListValue* New() const { return New(NULL); } |
- ListValue* 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; |
+ ListValue* New(::google::protobuf::Arena* arena) const; |
+ void CopyFrom(const ::google::protobuf::Message& from); |
+ void MergeFrom(const ::google::protobuf::Message& from); |
void CopyFrom(const ListValue& from); |
void MergeFrom(const ListValue& 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(ListValue* other); |
- protected: |
- explicit ListValue(::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(); |
@@ -470,7 +370,7 @@ class LIBPROTOBUF_EXPORT ListValue : public ::google::protobuf::Message /* @@pro |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
+ ::google::protobuf::Metadata GetMetadata() const; |
// nested types ---------------------------------------------------- |
@@ -492,16 +392,15 @@ class LIBPROTOBUF_EXPORT ListValue : public ::google::protobuf::Message /* @@pro |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- friend class ::google::protobuf::Arena; |
- typedef void InternalArenaConstructable_; |
- typedef void DestructorSkippable_; |
+ bool _is_default_instance_; |
::google::protobuf::RepeatedPtrField< ::google::protobuf::Value > values_; |
mutable int _cached_size_; |
- friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fstruct_2eproto_impl(); |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fstruct_2eproto_impl(); |
- friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fstruct_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fstruct_2eproto(); |
+ friend void protobuf_AssignDesc_google_2fprotobuf_2fstruct_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2fstruct_2eproto(); |
+ void InitAsDefaultInstance(); |
+ static ListValue* default_instance_; |
}; |
// =================================================================== |
@@ -509,8 +408,6 @@ class LIBPROTOBUF_EXPORT ListValue : public ::google::protobuf::Message /* @@pro |
// =================================================================== |
#if !PROTOBUF_INLINE_NOT_IN_HEADERS |
-// ------------------------------------------------------------------- |
- |
// Struct |
// map<string, .google.protobuf.Value> fields = 1; |
@@ -535,7 +432,7 @@ Struct::mutable_fields() { |
// Value |
-// .google.protobuf.NullValue null_value = 1; |
+// optional .google.protobuf.NullValue null_value = 1; |
inline bool Value::has_null_value() const { |
return kind_case() == kNullValue; |
} |
@@ -564,7 +461,7 @@ inline void Value::set_null_value(::google::protobuf::NullValue value) { |
// @@protoc_insertion_point(field_set:google.protobuf.Value.null_value) |
} |
-// double number_value = 2; |
+// optional double number_value = 2; |
inline bool Value::has_number_value() const { |
return kind_case() == kNumberValue; |
} |
@@ -593,7 +490,7 @@ inline void Value::set_number_value(double value) { |
// @@protoc_insertion_point(field_set:google.protobuf.Value.number_value) |
} |
-// string string_value = 3; |
+// optional string string_value = 3; |
inline bool Value::has_string_value() const { |
return kind_case() == kStringValue; |
} |
@@ -602,26 +499,25 @@ inline void Value::set_has_string_value() { |
} |
inline void Value::clear_string_value() { |
if (has_string_value()) { |
- kind_.string_value_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- GetArenaNoVirtual()); |
+ kind_.string_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
clear_has_kind(); |
} |
} |
inline const ::std::string& Value::string_value() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Value.string_value) |
if (has_string_value()) { |
- return kind_.string_value_.Get(); |
+ return kind_.string_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); |
} |
inline void Value::set_string_value(const ::std::string& value) { |
+ // @@protoc_insertion_point(field_set:google.protobuf.Value.string_value) |
if (!has_string_value()) { |
clear_kind(); |
set_has_string_value(); |
kind_.string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
- kind_.string_value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, |
- GetArenaNoVirtual()); |
+ kind_.string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); |
// @@protoc_insertion_point(field_set:google.protobuf.Value.string_value) |
} |
inline void Value::set_string_value(const char* value) { |
@@ -630,20 +526,18 @@ inline void Value::set_string_value(const char* value) { |
set_has_string_value(); |
kind_.string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
- kind_.string_value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- ::std::string(value), GetArenaNoVirtual()); |
+ kind_.string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
+ ::std::string(value)); |
// @@protoc_insertion_point(field_set_char:google.protobuf.Value.string_value) |
} |
-inline void Value::set_string_value(const char* value, |
- size_t size) { |
+inline void Value::set_string_value(const char* value, size_t size) { |
if (!has_string_value()) { |
clear_kind(); |
set_has_string_value(); |
kind_.string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
- kind_.string_value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( |
- reinterpret_cast<const char*>(value), size), |
- GetArenaNoVirtual()); |
+ kind_.string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( |
+ reinterpret_cast<const char*>(value), size)); |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.Value.string_value) |
} |
inline ::std::string* Value::mutable_string_value() { |
@@ -652,27 +546,14 @@ inline ::std::string* Value::mutable_string_value() { |
set_has_string_value(); |
kind_.string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
- return kind_.string_value_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- GetArenaNoVirtual()); |
// @@protoc_insertion_point(field_mutable:google.protobuf.Value.string_value) |
+ return kind_.string_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline ::std::string* Value::release_string_value() { |
// @@protoc_insertion_point(field_release:google.protobuf.Value.string_value) |
if (has_string_value()) { |
clear_has_kind(); |
- return kind_.string_value_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
- GetArenaNoVirtual()); |
- } else { |
- return NULL; |
- } |
-} |
-inline ::std::string* Value::unsafe_arena_release_string_value() { |
- // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Value.string_value) |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- if (has_string_value()) { |
- clear_has_kind(); |
- return kind_.string_value_.UnsafeArenaRelease( |
- &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); |
+ return kind_.string_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} else { |
return NULL; |
} |
@@ -684,25 +565,13 @@ inline void Value::set_allocated_string_value(::std::string* string_value) { |
clear_kind(); |
if (string_value != NULL) { |
set_has_string_value(); |
- kind_.string_value_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), string_value, |
- GetArenaNoVirtual()); |
+ kind_.string_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
+ string_value); |
} |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Value.string_value) |
} |
-inline void Value::unsafe_arena_set_allocated_string_value(::std::string* string_value) { |
- GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); |
- if (!has_string_value()) { |
- kind_.string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
- } |
- clear_kind(); |
- if (string_value) { |
- set_has_string_value(); |
- kind_.string_value_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), string_value, GetArenaNoVirtual()); |
- } |
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Value.string_value) |
-} |
-// bool bool_value = 4; |
+// optional bool bool_value = 4; |
inline bool Value::has_bool_value() const { |
return kind_case() == kBoolValue; |
} |
@@ -731,7 +600,7 @@ inline void Value::set_bool_value(bool value) { |
// @@protoc_insertion_point(field_set:google.protobuf.Value.bool_value) |
} |
-// .google.protobuf.Struct struct_value = 5; |
+// optional .google.protobuf.Struct struct_value = 5; |
inline bool Value::has_struct_value() const { |
return kind_case() == kStructValue; |
} |
@@ -740,9 +609,7 @@ inline void Value::set_has_struct_value() { |
} |
inline void Value::clear_struct_value() { |
if (has_struct_value()) { |
- if (GetArenaNoVirtual() == NULL) { |
- delete kind_.struct_value_; |
- } |
+ delete kind_.struct_value_; |
clear_has_kind(); |
} |
} |
@@ -756,9 +623,7 @@ inline ::google::protobuf::Struct* Value::mutable_struct_value() { |
if (!has_struct_value()) { |
clear_kind(); |
set_has_struct_value(); |
- kind_.struct_value_ = |
- ::google::protobuf::Arena::CreateMessage< ::google::protobuf::Struct >( |
- GetArenaNoVirtual()); |
+ kind_.struct_value_ = new ::google::protobuf::Struct; |
} |
// @@protoc_insertion_point(field_mutable:google.protobuf.Value.struct_value) |
return kind_.struct_value_; |
@@ -767,42 +632,6 @@ inline ::google::protobuf::Struct* Value::release_struct_value() { |
// @@protoc_insertion_point(field_release:google.protobuf.Value.struct_value) |
if (has_struct_value()) { |
clear_has_kind(); |
- if (GetArenaNoVirtual() != NULL) { |
- ::google::protobuf::Struct* temp = new ::google::protobuf::Struct(*kind_.struct_value_); |
- kind_.struct_value_ = NULL; |
- return temp; |
- } else { |
- ::google::protobuf::Struct* temp = kind_.struct_value_; |
- kind_.struct_value_ = NULL; |
- return temp; |
- } |
- } else { |
- return NULL; |
- } |
-} |
-inline void Value::set_allocated_struct_value(::google::protobuf::Struct* struct_value) { |
- clear_kind(); |
- if (struct_value) { |
- if (GetArenaNoVirtual() != NULL && |
- ::google::protobuf::Arena::GetArena(struct_value) == NULL) { |
- GetArenaNoVirtual()->Own(struct_value); |
- } else if (GetArenaNoVirtual() != |
- ::google::protobuf::Arena::GetArena(struct_value)) { |
- ::google::protobuf::Struct* new_struct_value = |
- ::google::protobuf::Arena::CreateMessage< ::google::protobuf::Struct >( |
- GetArenaNoVirtual()); |
- new_struct_value->CopyFrom(*struct_value); |
- struct_value = new_struct_value; |
- } |
- set_has_struct_value(); |
- kind_.struct_value_ = struct_value; |
- } |
- // @@protoc_insertion_point(field_set_allocated:google.protobuf.Value.struct_value) |
-} |
-inline ::google::protobuf::Struct* Value::unsafe_arena_release_struct_value() { |
- // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Value.struct_value) |
- if (has_struct_value()) { |
- clear_has_kind(); |
::google::protobuf::Struct* temp = kind_.struct_value_; |
kind_.struct_value_ = NULL; |
return temp; |
@@ -810,16 +639,16 @@ inline ::google::protobuf::Struct* Value::unsafe_arena_release_struct_value() { |
return NULL; |
} |
} |
-inline void Value::unsafe_arena_set_allocated_struct_value(::google::protobuf::Struct* struct_value) { |
+inline void Value::set_allocated_struct_value(::google::protobuf::Struct* struct_value) { |
clear_kind(); |
if (struct_value) { |
set_has_struct_value(); |
kind_.struct_value_ = struct_value; |
} |
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Value.struct_value) |
+ // @@protoc_insertion_point(field_set_allocated:google.protobuf.Value.struct_value) |
} |
-// .google.protobuf.ListValue list_value = 6; |
+// optional .google.protobuf.ListValue list_value = 6; |
inline bool Value::has_list_value() const { |
return kind_case() == kListValue; |
} |
@@ -828,9 +657,7 @@ inline void Value::set_has_list_value() { |
} |
inline void Value::clear_list_value() { |
if (has_list_value()) { |
- if (GetArenaNoVirtual() == NULL) { |
- delete kind_.list_value_; |
- } |
+ delete kind_.list_value_; |
clear_has_kind(); |
} |
} |
@@ -844,9 +671,7 @@ inline ::google::protobuf::ListValue* Value::mutable_list_value() { |
if (!has_list_value()) { |
clear_kind(); |
set_has_list_value(); |
- kind_.list_value_ = |
- ::google::protobuf::Arena::CreateMessage< ::google::protobuf::ListValue >( |
- GetArenaNoVirtual()); |
+ kind_.list_value_ = new ::google::protobuf::ListValue; |
} |
// @@protoc_insertion_point(field_mutable:google.protobuf.Value.list_value) |
return kind_.list_value_; |
@@ -855,42 +680,6 @@ inline ::google::protobuf::ListValue* Value::release_list_value() { |
// @@protoc_insertion_point(field_release:google.protobuf.Value.list_value) |
if (has_list_value()) { |
clear_has_kind(); |
- if (GetArenaNoVirtual() != NULL) { |
- ::google::protobuf::ListValue* temp = new ::google::protobuf::ListValue(*kind_.list_value_); |
- kind_.list_value_ = NULL; |
- return temp; |
- } else { |
- ::google::protobuf::ListValue* temp = kind_.list_value_; |
- kind_.list_value_ = NULL; |
- return temp; |
- } |
- } else { |
- return NULL; |
- } |
-} |
-inline void Value::set_allocated_list_value(::google::protobuf::ListValue* list_value) { |
- clear_kind(); |
- if (list_value) { |
- if (GetArenaNoVirtual() != NULL && |
- ::google::protobuf::Arena::GetArena(list_value) == NULL) { |
- GetArenaNoVirtual()->Own(list_value); |
- } else if (GetArenaNoVirtual() != |
- ::google::protobuf::Arena::GetArena(list_value)) { |
- ::google::protobuf::ListValue* new_list_value = |
- ::google::protobuf::Arena::CreateMessage< ::google::protobuf::ListValue >( |
- GetArenaNoVirtual()); |
- new_list_value->CopyFrom(*list_value); |
- list_value = new_list_value; |
- } |
- set_has_list_value(); |
- kind_.list_value_ = list_value; |
- } |
- // @@protoc_insertion_point(field_set_allocated:google.protobuf.Value.list_value) |
-} |
-inline ::google::protobuf::ListValue* Value::unsafe_arena_release_list_value() { |
- // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Value.list_value) |
- if (has_list_value()) { |
- clear_has_kind(); |
::google::protobuf::ListValue* temp = kind_.list_value_; |
kind_.list_value_ = NULL; |
return temp; |
@@ -898,13 +687,13 @@ inline ::google::protobuf::ListValue* Value::unsafe_arena_release_list_value() |
return NULL; |
} |
} |
-inline void Value::unsafe_arena_set_allocated_list_value(::google::protobuf::ListValue* list_value) { |
+inline void Value::set_allocated_list_value(::google::protobuf::ListValue* list_value) { |
clear_kind(); |
if (list_value) { |
set_has_list_value(); |
kind_.list_value_ = list_value; |
} |
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Value.list_value) |
+ // @@protoc_insertion_point(field_set_allocated:google.protobuf.Value.list_value) |
} |
inline bool Value::has_kind() const { |
@@ -955,12 +744,9 @@ ListValue::values() const { |
// ------------------------------------------------------------------- |
-// ------------------------------------------------------------------- |
- |
// @@protoc_insertion_point(namespace_scope) |
- |
} // namespace protobuf |
} // namespace google |