Index: third_party/protobuf/src/google/protobuf/api.pb.h |
diff --git a/third_party/protobuf/src/google/protobuf/api.pb.h b/third_party/protobuf/src/google/protobuf/api.pb.h |
index bb35e471a38dccc900c0555828f1a4f00c98d5d4..f4699a5c9fd56cd40cdbffba5906d0de2a07c715 100644 |
--- a/third_party/protobuf/src/google/protobuf/api.pb.h |
+++ b/third_party/protobuf/src/google/protobuf/api.pb.h |
@@ -8,12 +8,12 @@ |
#include <google/protobuf/stubs/common.h> |
-#if GOOGLE_PROTOBUF_VERSION < 3000000 |
+#if GOOGLE_PROTOBUF_VERSION < 3001000 |
#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 3000000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION |
+#if 3001000 < 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,28 +24,54 @@ |
#include <google/protobuf/generated_message_util.h> |
#include <google/protobuf/metadata.h> |
#include <google/protobuf/message.h> |
-#include <google/protobuf/repeated_field.h> |
-#include <google/protobuf/extension_set.h> |
+#include <google/protobuf/repeated_field.h> // IWYU pragma: export |
+#include <google/protobuf/extension_set.h> // IWYU pragma: export |
#include <google/protobuf/unknown_field_set.h> |
#include <google/protobuf/source_context.pb.h> |
#include <google/protobuf/type.pb.h> |
// @@protoc_insertion_point(includes) |
+namespace google { |
+namespace protobuf { |
+class Api; |
+class ApiDefaultTypeInternal; |
+LIBPROTOBUF_EXPORT extern ApiDefaultTypeInternal _Api_default_instance_; |
+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 Method; |
+class MethodDefaultTypeInternal; |
+LIBPROTOBUF_EXPORT extern MethodDefaultTypeInternal _Method_default_instance_; |
+class Mixin; |
+class MixinDefaultTypeInternal; |
+LIBPROTOBUF_EXPORT extern MixinDefaultTypeInternal _Mixin_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_2fapi_2eproto(); |
-void protobuf_AssignDesc_google_2fprotobuf_2fapi_2eproto(); |
-void protobuf_ShutdownFile_google_2fprotobuf_2fapi_2eproto(); |
- |
-class Api; |
-class Method; |
-class Mixin; |
+void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto(); |
// =================================================================== |
-class LIBPROTOBUF_EXPORT Api : public ::google::protobuf::Message { |
+class LIBPROTOBUF_EXPORT Api : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Api) */ { |
public: |
Api(); |
virtual ~Api(); |
@@ -60,48 +86,58 @@ class LIBPROTOBUF_EXPORT Api : public ::google::protobuf::Message { |
static const ::google::protobuf::Descriptor* descriptor(); |
static const Api& default_instance(); |
+ static inline const Api* internal_default_instance() { |
+ return reinterpret_cast<const Api*>( |
+ &_Api_default_instance_); |
+ } |
+ |
void Swap(Api* other); |
// implements Message ---------------------------------------------- |
- inline Api* New() const { return New(NULL); } |
+ inline Api* New() const PROTOBUF_FINAL { return New(NULL); } |
- Api* New(::google::protobuf::Arena* arena) const; |
- void CopyFrom(const ::google::protobuf::Message& from); |
- void MergeFrom(const ::google::protobuf::Message& from); |
+ Api* 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; |
void CopyFrom(const Api& from); |
void MergeFrom(const Api& from); |
- void Clear(); |
- bool IsInitialized() const; |
+ void Clear() PROTOBUF_FINAL; |
+ bool IsInitialized() const PROTOBUF_FINAL; |
- int ByteSize() const; |
+ size_t ByteSizeLong() const PROTOBUF_FINAL; |
bool MergePartialFromCodedStream( |
- ::google::protobuf::io::CodedInputStream* input); |
+ ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; |
void SerializeWithCachedSizes( |
- ::google::protobuf::io::CodedOutputStream* output) const; |
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; |
- int GetCachedSize() const { return _cached_size_; } |
+ ::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_; } |
private: |
void SharedCtor(); |
void SharedDtor(); |
- void SetCachedSize(int size) const; |
+ void SetCachedSize(int size) const PROTOBUF_FINAL; |
void InternalSwap(Api* other); |
private: |
inline ::google::protobuf::Arena* GetArenaNoVirtual() const { |
- return _internal_metadata_.arena(); |
+ return NULL; |
} |
inline void* MaybeArenaPtr() const { |
- return _internal_metadata_.raw_arena_ptr(); |
+ return NULL; |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const; |
+ ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
// nested types ---------------------------------------------------- |
// accessors ------------------------------------------------------- |
- // optional string name = 1; |
+ // string name = 1; |
void clear_name(); |
static const int kNameFieldNumber = 1; |
const ::std::string& name() const; |
@@ -136,7 +172,7 @@ class LIBPROTOBUF_EXPORT Api : public ::google::protobuf::Message { |
const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& |
options() const; |
- // optional string version = 4; |
+ // string version = 4; |
void clear_version(); |
static const int kVersionFieldNumber = 4; |
const ::std::string& version() const; |
@@ -147,7 +183,7 @@ class LIBPROTOBUF_EXPORT Api : public ::google::protobuf::Message { |
::std::string* release_version(); |
void set_allocated_version(::std::string* version); |
- // optional .google.protobuf.SourceContext source_context = 5; |
+ // .google.protobuf.SourceContext source_context = 5; |
bool has_source_context() const; |
void clear_source_context(); |
static const int kSourceContextFieldNumber = 5; |
@@ -168,7 +204,7 @@ class LIBPROTOBUF_EXPORT Api : public ::google::protobuf::Message { |
const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >& |
mixins() const; |
- // optional .google.protobuf.Syntax syntax = 7; |
+ // .google.protobuf.Syntax syntax = 7; |
void clear_syntax(); |
static const int kSyntaxFieldNumber = 7; |
::google::protobuf::Syntax syntax() const; |
@@ -178,25 +214,23 @@ class LIBPROTOBUF_EXPORT Api : public ::google::protobuf::Message { |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- bool _is_default_instance_; |
- ::google::protobuf::internal::ArenaStringPtr name_; |
::google::protobuf::RepeatedPtrField< ::google::protobuf::Method > methods_; |
::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; |
+ ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin > mixins_; |
+ ::google::protobuf::internal::ArenaStringPtr name_; |
::google::protobuf::internal::ArenaStringPtr version_; |
::google::protobuf::SourceContext* source_context_; |
- ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin > mixins_; |
int syntax_; |
mutable int _cached_size_; |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto(); |
- friend void protobuf_AssignDesc_google_2fprotobuf_2fapi_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto_impl(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto_impl(); |
+ friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fapi_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2fapi_2eproto(); |
- void InitAsDefaultInstance(); |
- static Api* default_instance_; |
}; |
// ------------------------------------------------------------------- |
-class LIBPROTOBUF_EXPORT Method : public ::google::protobuf::Message { |
+class LIBPROTOBUF_EXPORT Method : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Method) */ { |
public: |
Method(); |
virtual ~Method(); |
@@ -211,48 +245,58 @@ class LIBPROTOBUF_EXPORT Method : public ::google::protobuf::Message { |
static const ::google::protobuf::Descriptor* descriptor(); |
static const Method& default_instance(); |
+ static inline const Method* internal_default_instance() { |
+ return reinterpret_cast<const Method*>( |
+ &_Method_default_instance_); |
+ } |
+ |
void Swap(Method* other); |
// implements Message ---------------------------------------------- |
- inline Method* New() const { return New(NULL); } |
+ inline Method* New() const PROTOBUF_FINAL { return New(NULL); } |
- Method* New(::google::protobuf::Arena* arena) const; |
- void CopyFrom(const ::google::protobuf::Message& from); |
- void MergeFrom(const ::google::protobuf::Message& from); |
+ Method* 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; |
void CopyFrom(const Method& from); |
void MergeFrom(const Method& from); |
- void Clear(); |
- bool IsInitialized() const; |
+ void Clear() PROTOBUF_FINAL; |
+ bool IsInitialized() const PROTOBUF_FINAL; |
- int ByteSize() const; |
+ size_t ByteSizeLong() const PROTOBUF_FINAL; |
bool MergePartialFromCodedStream( |
- ::google::protobuf::io::CodedInputStream* input); |
+ ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; |
void SerializeWithCachedSizes( |
- ::google::protobuf::io::CodedOutputStream* output) const; |
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; |
- int GetCachedSize() const { return _cached_size_; } |
+ ::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_; } |
private: |
void SharedCtor(); |
void SharedDtor(); |
- void SetCachedSize(int size) const; |
+ void SetCachedSize(int size) const PROTOBUF_FINAL; |
void InternalSwap(Method* other); |
private: |
inline ::google::protobuf::Arena* GetArenaNoVirtual() const { |
- return _internal_metadata_.arena(); |
+ return NULL; |
} |
inline void* MaybeArenaPtr() const { |
- return _internal_metadata_.raw_arena_ptr(); |
+ return NULL; |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const; |
+ ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
// nested types ---------------------------------------------------- |
// accessors ------------------------------------------------------- |
- // optional string name = 1; |
+ // string name = 1; |
void clear_name(); |
static const int kNameFieldNumber = 1; |
const ::std::string& name() const; |
@@ -263,7 +307,7 @@ class LIBPROTOBUF_EXPORT Method : public ::google::protobuf::Message { |
::std::string* release_name(); |
void set_allocated_name(::std::string* name); |
- // optional string request_type_url = 2; |
+ // string request_type_url = 2; |
void clear_request_type_url(); |
static const int kRequestTypeUrlFieldNumber = 2; |
const ::std::string& request_type_url() const; |
@@ -274,13 +318,13 @@ class LIBPROTOBUF_EXPORT Method : public ::google::protobuf::Message { |
::std::string* release_request_type_url(); |
void set_allocated_request_type_url(::std::string* request_type_url); |
- // optional bool request_streaming = 3; |
+ // bool request_streaming = 3; |
void clear_request_streaming(); |
static const int kRequestStreamingFieldNumber = 3; |
bool request_streaming() const; |
void set_request_streaming(bool value); |
- // optional string response_type_url = 4; |
+ // string response_type_url = 4; |
void clear_response_type_url(); |
static const int kResponseTypeUrlFieldNumber = 4; |
const ::std::string& response_type_url() const; |
@@ -291,7 +335,7 @@ class LIBPROTOBUF_EXPORT Method : public ::google::protobuf::Message { |
::std::string* release_response_type_url(); |
void set_allocated_response_type_url(::std::string* response_type_url); |
- // optional bool response_streaming = 5; |
+ // bool response_streaming = 5; |
void clear_response_streaming(); |
static const int kResponseStreamingFieldNumber = 5; |
bool response_streaming() const; |
@@ -309,7 +353,7 @@ class LIBPROTOBUF_EXPORT Method : public ::google::protobuf::Message { |
const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& |
options() const; |
- // optional .google.protobuf.Syntax syntax = 7; |
+ // .google.protobuf.Syntax syntax = 7; |
void clear_syntax(); |
static const int kSyntaxFieldNumber = 7; |
::google::protobuf::Syntax syntax() const; |
@@ -319,25 +363,23 @@ class LIBPROTOBUF_EXPORT Method : public ::google::protobuf::Message { |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- bool _is_default_instance_; |
+ ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; |
::google::protobuf::internal::ArenaStringPtr name_; |
::google::protobuf::internal::ArenaStringPtr request_type_url_; |
::google::protobuf::internal::ArenaStringPtr response_type_url_; |
bool request_streaming_; |
bool response_streaming_; |
int syntax_; |
- ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; |
mutable int _cached_size_; |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto(); |
- friend void protobuf_AssignDesc_google_2fprotobuf_2fapi_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto_impl(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto_impl(); |
+ friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fapi_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2fapi_2eproto(); |
- void InitAsDefaultInstance(); |
- static Method* default_instance_; |
}; |
// ------------------------------------------------------------------- |
-class LIBPROTOBUF_EXPORT Mixin : public ::google::protobuf::Message { |
+class LIBPROTOBUF_EXPORT Mixin : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Mixin) */ { |
public: |
Mixin(); |
virtual ~Mixin(); |
@@ -352,48 +394,58 @@ class LIBPROTOBUF_EXPORT Mixin : public ::google::protobuf::Message { |
static const ::google::protobuf::Descriptor* descriptor(); |
static const Mixin& default_instance(); |
+ static inline const Mixin* internal_default_instance() { |
+ return reinterpret_cast<const Mixin*>( |
+ &_Mixin_default_instance_); |
+ } |
+ |
void Swap(Mixin* other); |
// implements Message ---------------------------------------------- |
- inline Mixin* New() const { return New(NULL); } |
+ inline Mixin* New() const PROTOBUF_FINAL { return New(NULL); } |
- Mixin* New(::google::protobuf::Arena* arena) const; |
- void CopyFrom(const ::google::protobuf::Message& from); |
- void MergeFrom(const ::google::protobuf::Message& from); |
+ Mixin* 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; |
void CopyFrom(const Mixin& from); |
void MergeFrom(const Mixin& from); |
- void Clear(); |
- bool IsInitialized() const; |
+ void Clear() PROTOBUF_FINAL; |
+ bool IsInitialized() const PROTOBUF_FINAL; |
- int ByteSize() const; |
+ size_t ByteSizeLong() const PROTOBUF_FINAL; |
bool MergePartialFromCodedStream( |
- ::google::protobuf::io::CodedInputStream* input); |
+ ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; |
void SerializeWithCachedSizes( |
- ::google::protobuf::io::CodedOutputStream* output) const; |
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; |
- int GetCachedSize() const { return _cached_size_; } |
+ ::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_; } |
private: |
void SharedCtor(); |
void SharedDtor(); |
- void SetCachedSize(int size) const; |
+ void SetCachedSize(int size) const PROTOBUF_FINAL; |
void InternalSwap(Mixin* other); |
private: |
inline ::google::protobuf::Arena* GetArenaNoVirtual() const { |
- return _internal_metadata_.arena(); |
+ return NULL; |
} |
inline void* MaybeArenaPtr() const { |
- return _internal_metadata_.raw_arena_ptr(); |
+ return NULL; |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const; |
+ ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
// nested types ---------------------------------------------------- |
// accessors ------------------------------------------------------- |
- // optional string name = 1; |
+ // string name = 1; |
void clear_name(); |
static const int kNameFieldNumber = 1; |
const ::std::string& name() const; |
@@ -404,7 +456,7 @@ class LIBPROTOBUF_EXPORT Mixin : public ::google::protobuf::Message { |
::std::string* release_name(); |
void set_allocated_name(::std::string* name); |
- // optional string root = 2; |
+ // string root = 2; |
void clear_root(); |
static const int kRootFieldNumber = 2; |
const ::std::string& root() const; |
@@ -419,16 +471,14 @@ class LIBPROTOBUF_EXPORT Mixin : public ::google::protobuf::Message { |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- bool _is_default_instance_; |
::google::protobuf::internal::ArenaStringPtr name_; |
::google::protobuf::internal::ArenaStringPtr root_; |
mutable int _cached_size_; |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto(); |
- friend void protobuf_AssignDesc_google_2fprotobuf_2fapi_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto_impl(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto_impl(); |
+ friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fapi_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2fapi_2eproto(); |
- void InitAsDefaultInstance(); |
- static Mixin* default_instance_; |
}; |
// =================================================================== |
@@ -438,13 +488,13 @@ class LIBPROTOBUF_EXPORT Mixin : public ::google::protobuf::Message { |
#if !PROTOBUF_INLINE_NOT_IN_HEADERS |
// Api |
-// optional string name = 1; |
+// string name = 1; |
inline void Api::clear_name() { |
name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Api::name() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Api.name) |
- return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ return name_.GetNoArena(); |
} |
inline void Api::set_name(const ::std::string& value) { |
@@ -542,13 +592,13 @@ Api::options() const { |
return options_; |
} |
-// optional string version = 4; |
+// string version = 4; |
inline void Api::clear_version() { |
version_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Api::version() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Api.version) |
- return version_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ return version_.GetNoArena(); |
} |
inline void Api::set_version(const ::std::string& value) { |
@@ -586,9 +636,9 @@ inline void Api::set_allocated_version(::std::string* version) { |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Api.version) |
} |
-// optional .google.protobuf.SourceContext source_context = 5; |
+// .google.protobuf.SourceContext source_context = 5; |
inline bool Api::has_source_context() const { |
- return !_is_default_instance_ && source_context_ != NULL; |
+ return this != internal_default_instance() && source_context_ != NULL; |
} |
inline void Api::clear_source_context() { |
if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_; |
@@ -596,7 +646,8 @@ inline void Api::clear_source_context() { |
} |
inline const ::google::protobuf::SourceContext& Api::source_context() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Api.source_context) |
- return source_context_ != NULL ? *source_context_ : *default_instance_->source_context_; |
+ return source_context_ != NULL ? *source_context_ |
+ : *::google::protobuf::SourceContext::internal_default_instance(); |
} |
inline ::google::protobuf::SourceContext* Api::mutable_source_context() { |
@@ -654,7 +705,7 @@ Api::mixins() const { |
return mixins_; |
} |
-// optional .google.protobuf.Syntax syntax = 7; |
+// .google.protobuf.Syntax syntax = 7; |
inline void Api::clear_syntax() { |
syntax_ = 0; |
} |
@@ -672,13 +723,13 @@ inline void Api::set_syntax(::google::protobuf::Syntax value) { |
// Method |
-// optional string name = 1; |
+// string name = 1; |
inline void Method::clear_name() { |
name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Method::name() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Method.name) |
- return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ return name_.GetNoArena(); |
} |
inline void Method::set_name(const ::std::string& value) { |
@@ -716,13 +767,13 @@ inline void Method::set_allocated_name(::std::string* name) { |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.name) |
} |
-// optional string request_type_url = 2; |
+// string request_type_url = 2; |
inline void Method::clear_request_type_url() { |
request_type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Method::request_type_url() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Method.request_type_url) |
- return request_type_url_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ return request_type_url_.GetNoArena(); |
} |
inline void Method::set_request_type_url(const ::std::string& value) { |
@@ -760,7 +811,7 @@ inline void Method::set_allocated_request_type_url(::std::string* request_type_u |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.request_type_url) |
} |
-// optional bool request_streaming = 3; |
+// bool request_streaming = 3; |
inline void Method::clear_request_streaming() { |
request_streaming_ = false; |
} |
@@ -774,13 +825,13 @@ inline void Method::set_request_streaming(bool value) { |
// @@protoc_insertion_point(field_set:google.protobuf.Method.request_streaming) |
} |
-// optional string response_type_url = 4; |
+// string response_type_url = 4; |
inline void Method::clear_response_type_url() { |
response_type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Method::response_type_url() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Method.response_type_url) |
- return response_type_url_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ return response_type_url_.GetNoArena(); |
} |
inline void Method::set_response_type_url(const ::std::string& value) { |
@@ -818,7 +869,7 @@ inline void Method::set_allocated_response_type_url(::std::string* response_type |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.response_type_url) |
} |
-// optional bool response_streaming = 5; |
+// bool response_streaming = 5; |
inline void Method::clear_response_streaming() { |
response_streaming_ = false; |
} |
@@ -862,7 +913,7 @@ Method::options() const { |
return options_; |
} |
-// optional .google.protobuf.Syntax syntax = 7; |
+// .google.protobuf.Syntax syntax = 7; |
inline void Method::clear_syntax() { |
syntax_ = 0; |
} |
@@ -880,13 +931,13 @@ inline void Method::set_syntax(::google::protobuf::Syntax value) { |
// Mixin |
-// optional string name = 1; |
+// string name = 1; |
inline void Mixin::clear_name() { |
name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Mixin::name() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Mixin.name) |
- return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ return name_.GetNoArena(); |
} |
inline void Mixin::set_name(const ::std::string& value) { |
@@ -924,13 +975,13 @@ inline void Mixin::set_allocated_name(::std::string* name) { |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Mixin.name) |
} |
-// optional string root = 2; |
+// string root = 2; |
inline void Mixin::clear_root() { |
root_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Mixin::root() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Mixin.root) |
- return root_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ return root_.GetNoArena(); |
} |
inline void Mixin::set_root(const ::std::string& value) { |
@@ -976,6 +1027,7 @@ inline void Mixin::set_allocated_root(::std::string* root) { |
// @@protoc_insertion_point(namespace_scope) |
+ |
} // namespace protobuf |
} // namespace google |