| Index: third_party/protobuf/src/google/protobuf/api.pb.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/api.pb.cc b/third_party/protobuf/src/google/protobuf/api.pb.cc
|
| index cbeba3023fa093273c81979967412fe861fdada5..2bc6153a1e7a6ef43d77caaee3cf6a68f1c39f86 100644
|
| --- a/third_party/protobuf/src/google/protobuf/api.pb.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/api.pb.cc
|
| @@ -19,30 +19,27 @@
|
|
|
| namespace google {
|
| namespace protobuf {
|
| +class ApiDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<Api> {};
|
| +ApiDefaultTypeInternal _Api_default_instance_;
|
| +class MethodDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<Method> {};
|
| +MethodDefaultTypeInternal _Method_default_instance_;
|
| +class MixinDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<Mixin> {};
|
| +MixinDefaultTypeInternal _Mixin_default_instance_;
|
|
|
| namespace {
|
|
|
| -const ::google::protobuf::Descriptor* Api_descriptor_ = NULL;
|
| -const ::google::protobuf::internal::GeneratedMessageReflection*
|
| - Api_reflection_ = NULL;
|
| -const ::google::protobuf::Descriptor* Method_descriptor_ = NULL;
|
| -const ::google::protobuf::internal::GeneratedMessageReflection*
|
| - Method_reflection_ = NULL;
|
| -const ::google::protobuf::Descriptor* Mixin_descriptor_ = NULL;
|
| -const ::google::protobuf::internal::GeneratedMessageReflection*
|
| - Mixin_reflection_ = NULL;
|
| +::google::protobuf::Metadata file_level_metadata[3];
|
|
|
| } // namespace
|
|
|
|
|
| -void protobuf_AssignDesc_google_2fprotobuf_2fapi_2eproto() {
|
| - protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto();
|
| - const ::google::protobuf::FileDescriptor* file =
|
| - ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
|
| - "google/protobuf/api.proto");
|
| - GOOGLE_CHECK(file != NULL);
|
| - Api_descriptor_ = file->message_type(0);
|
| - static const int Api_offsets_[7] = {
|
| +const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fapi_2eproto() GOOGLE_ATTRIBUTE_COLD;
|
| +const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fapi_2eproto() {
|
| + static const ::google::protobuf::uint32 offsets[] = {
|
| + ~0u, // no _has_bits_
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Api, _internal_metadata_),
|
| + ~0u, // no _extensions_
|
| + ~0u, // no _oneof_case_
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Api, name_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Api, methods_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Api, options_),
|
| @@ -50,20 +47,10 @@ void protobuf_AssignDesc_google_2fprotobuf_2fapi_2eproto() {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Api, source_context_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Api, mixins_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Api, syntax_),
|
| - };
|
| - Api_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| - Api_descriptor_,
|
| - Api::default_instance_,
|
| - Api_offsets_,
|
| - -1,
|
| - -1,
|
| - -1,
|
| - sizeof(Api),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Api, _internal_metadata_),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Api, _is_default_instance_));
|
| - Method_descriptor_ = file->message_type(1);
|
| - static const int Method_offsets_[7] = {
|
| + ~0u, // no _has_bits_
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Method, _internal_metadata_),
|
| + ~0u, // no _extensions_
|
| + ~0u, // no _oneof_case_
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Method, name_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Method, request_type_url_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Method, request_streaming_),
|
| @@ -71,103 +58,114 @@ void protobuf_AssignDesc_google_2fprotobuf_2fapi_2eproto() {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Method, response_streaming_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Method, options_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Method, syntax_),
|
| - };
|
| - Method_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| - Method_descriptor_,
|
| - Method::default_instance_,
|
| - Method_offsets_,
|
| - -1,
|
| - -1,
|
| - -1,
|
| - sizeof(Method),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Method, _internal_metadata_),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Method, _is_default_instance_));
|
| - Mixin_descriptor_ = file->message_type(2);
|
| - static const int Mixin_offsets_[2] = {
|
| + ~0u, // no _has_bits_
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Mixin, _internal_metadata_),
|
| + ~0u, // no _extensions_
|
| + ~0u, // no _oneof_case_
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Mixin, name_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Mixin, root_),
|
| };
|
| - Mixin_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| - Mixin_descriptor_,
|
| - Mixin::default_instance_,
|
| - Mixin_offsets_,
|
| - -1,
|
| - -1,
|
| - -1,
|
| - sizeof(Mixin),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Mixin, _internal_metadata_),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Mixin, _is_default_instance_));
|
| + return offsets;
|
| }
|
|
|
| +static const ::google::protobuf::internal::MigrationSchema schemas[] = {
|
| + { 0, -1, sizeof(Api)},
|
| + { 11, -1, sizeof(Method)},
|
| + { 22, -1, sizeof(Mixin)},
|
| +};
|
| +
|
| +static const ::google::protobuf::internal::DefaultInstanceData file_default_instances[] = {
|
| + {reinterpret_cast<const ::google::protobuf::Message*>(&_Api_default_instance_), NULL},
|
| + {reinterpret_cast<const ::google::protobuf::Message*>(&_Method_default_instance_), NULL},
|
| + {reinterpret_cast<const ::google::protobuf::Message*>(&_Mixin_default_instance_), NULL},
|
| +};
|
| +
|
| namespace {
|
|
|
| -GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
|
| -inline void protobuf_AssignDescriptorsOnce() {
|
| - ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
|
| - &protobuf_AssignDesc_google_2fprotobuf_2fapi_2eproto);
|
| +void protobuf_AssignDescriptors() {
|
| + protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto();
|
| + ::google::protobuf::MessageFactory* factory = NULL;
|
| + AssignDescriptors(
|
| + "google/protobuf/api.proto", schemas, file_default_instances, protobuf_Offsets_google_2fprotobuf_2fapi_2eproto(), factory,
|
| + file_level_metadata, NULL, NULL);
|
| }
|
|
|
| +void protobuf_AssignDescriptorsOnce() {
|
| + static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
|
| + ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
|
| +}
|
| +
|
| +void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
|
| void protobuf_RegisterTypes(const ::std::string&) {
|
| protobuf_AssignDescriptorsOnce();
|
| - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - Api_descriptor_, &Api::default_instance());
|
| - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - Method_descriptor_, &Method::default_instance());
|
| - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - Mixin_descriptor_, &Mixin::default_instance());
|
| + ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 3);
|
| }
|
|
|
| } // namespace
|
|
|
| void protobuf_ShutdownFile_google_2fprotobuf_2fapi_2eproto() {
|
| - delete Api::default_instance_;
|
| - delete Api_reflection_;
|
| - delete Method::default_instance_;
|
| - delete Method_reflection_;
|
| - delete Mixin::default_instance_;
|
| - delete Mixin_reflection_;
|
| + _Api_default_instance_.Shutdown();
|
| + delete file_level_metadata[0].reflection;
|
| + _Method_default_instance_.Shutdown();
|
| + delete file_level_metadata[1].reflection;
|
| + _Mixin_default_instance_.Shutdown();
|
| + delete file_level_metadata[2].reflection;
|
| }
|
|
|
| -void protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto() {
|
| - static bool already_here = false;
|
| - if (already_here) return;
|
| - already_here = true;
|
| +void protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto_impl() {
|
| GOOGLE_PROTOBUF_VERIFY_VERSION;
|
|
|
| - ::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto();
|
| - ::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto();
|
| + ::google::protobuf::protobuf_InitDefaults_google_2fprotobuf_2fsource_5fcontext_2eproto();
|
| + ::google::protobuf::protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();
|
| + ::google::protobuf::internal::InitProtobufDefaults();
|
| + _Api_default_instance_.DefaultConstruct();
|
| + _Method_default_instance_.DefaultConstruct();
|
| + _Mixin_default_instance_.DefaultConstruct();
|
| + _Api_default_instance_.get_mutable()->source_context_ = const_cast< ::google::protobuf::SourceContext*>(
|
| + ::google::protobuf::SourceContext::internal_default_instance());
|
| +}
|
| +
|
| +void protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto() {
|
| + static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
|
| + ::google::protobuf::GoogleOnceInit(&once, &protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto_impl);
|
| +}
|
| +void protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto_impl() {
|
| + protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto();
|
| + static const char descriptor[] = {
|
| + "\n\031google/protobuf/api.proto\022\017google.prot"
|
| + "obuf\032$google/protobuf/source_context.pro"
|
| + "to\032\032google/protobuf/type.proto\"\201\002\n\003Api\022\014"
|
| + "\n\004name\030\001 \001(\t\022(\n\007methods\030\002 \003(\0132\027.google.p"
|
| + "rotobuf.Method\022(\n\007options\030\003 \003(\0132\027.google"
|
| + ".protobuf.Option\022\017\n\007version\030\004 \001(\t\0226\n\016sou"
|
| + "rce_context\030\005 \001(\0132\036.google.protobuf.Sour"
|
| + "ceContext\022&\n\006mixins\030\006 \003(\0132\026.google.proto"
|
| + "buf.Mixin\022\'\n\006syntax\030\007 \001(\0162\027.google.proto"
|
| + "buf.Syntax\"\325\001\n\006Method\022\014\n\004name\030\001 \001(\t\022\030\n\020r"
|
| + "equest_type_url\030\002 \001(\t\022\031\n\021request_streami"
|
| + "ng\030\003 \001(\010\022\031\n\021response_type_url\030\004 \001(\t\022\032\n\022r"
|
| + "esponse_streaming\030\005 \001(\010\022(\n\007options\030\006 \003(\013"
|
| + "2\027.google.protobuf.Option\022\'\n\006syntax\030\007 \001("
|
| + "\0162\027.google.protobuf.Syntax\"#\n\005Mixin\022\014\n\004n"
|
| + "ame\030\001 \001(\t\022\014\n\004root\030\002 \001(\tBu\n\023com.google.pr"
|
| + "otobufB\010ApiProtoP\001Z+google.golang.org/ge"
|
| + "nproto/protobuf/api;api\242\002\003GPB\252\002\036Google.P"
|
| + "rotobuf.WellKnownTypesb\006proto3"
|
| + };
|
| ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
|
| - "\n\031google/protobuf/api.proto\022\017google.prot"
|
| - "obuf\032$google/protobuf/source_context.pro"
|
| - "to\032\032google/protobuf/type.proto\"\201\002\n\003Api\022\014"
|
| - "\n\004name\030\001 \001(\t\022(\n\007methods\030\002 \003(\0132\027.google.p"
|
| - "rotobuf.Method\022(\n\007options\030\003 \003(\0132\027.google"
|
| - ".protobuf.Option\022\017\n\007version\030\004 \001(\t\0226\n\016sou"
|
| - "rce_context\030\005 \001(\0132\036.google.protobuf.Sour"
|
| - "ceContext\022&\n\006mixins\030\006 \003(\0132\026.google.proto"
|
| - "buf.Mixin\022\'\n\006syntax\030\007 \001(\0162\027.google.proto"
|
| - "buf.Syntax\"\325\001\n\006Method\022\014\n\004name\030\001 \001(\t\022\030\n\020r"
|
| - "equest_type_url\030\002 \001(\t\022\031\n\021request_streami"
|
| - "ng\030\003 \001(\010\022\031\n\021response_type_url\030\004 \001(\t\022\032\n\022r"
|
| - "esponse_streaming\030\005 \001(\010\022(\n\007options\030\006 \003(\013"
|
| - "2\027.google.protobuf.Option\022\'\n\006syntax\030\007 \001("
|
| - "\0162\027.google.protobuf.Syntax\"#\n\005Mixin\022\014\n\004n"
|
| - "ame\030\001 \001(\t\022\014\n\004root\030\002 \001(\tBK\n\023com.google.pr"
|
| - "otobufB\010ApiProtoP\001\240\001\001\242\002\003GPB\252\002\036Google.Pro"
|
| - "tobuf.WellKnownTypesb\006proto3", 708);
|
| + descriptor, 750);
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
|
| "google/protobuf/api.proto", &protobuf_RegisterTypes);
|
| - Api::default_instance_ = new Api();
|
| - Method::default_instance_ = new Method();
|
| - Mixin::default_instance_ = new Mixin();
|
| - Api::default_instance_->InitAsDefaultInstance();
|
| - Method::default_instance_->InitAsDefaultInstance();
|
| - Mixin::default_instance_->InitAsDefaultInstance();
|
| + ::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto();
|
| + ::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto();
|
| ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_google_2fprotobuf_2fapi_2eproto);
|
| }
|
|
|
| +GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto_once_);
|
| +void protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto() {
|
| + ::google::protobuf::GoogleOnceInit(&protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto_once_,
|
| + &protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto_impl);
|
| +}
|
| // Force AddDescriptors() to be called at static initialization time.
|
| struct StaticDescriptorInitializer_google_2fprotobuf_2fapi_2eproto {
|
| StaticDescriptorInitializer_google_2fprotobuf_2fapi_2eproto() {
|
| @@ -175,16 +173,6 @@ struct StaticDescriptorInitializer_google_2fprotobuf_2fapi_2eproto {
|
| }
|
| } static_descriptor_initializer_google_2fprotobuf_2fapi_2eproto_;
|
|
|
| -namespace {
|
| -
|
| -static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD;
|
| -static void MergeFromFail(int line) {
|
| - GOOGLE_CHECK(false) << __FILE__ << ":" << line;
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -
|
| // ===================================================================
|
|
|
| #if !defined(_MSC_VER) || _MSC_VER >= 1900
|
| @@ -199,31 +187,43 @@ const int Api::kSyntaxFieldNumber;
|
|
|
| Api::Api()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| + protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto();
|
| + }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.Api)
|
| }
|
| -
|
| -void Api::InitAsDefaultInstance() {
|
| - _is_default_instance_ = true;
|
| - source_context_ = const_cast< ::google::protobuf::SourceContext*>(&::google::protobuf::SourceContext::default_instance());
|
| -}
|
| -
|
| Api::Api(const Api& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| - SharedCtor();
|
| - MergeFrom(from);
|
| + _internal_metadata_(NULL),
|
| + methods_(from.methods_),
|
| + options_(from.options_),
|
| + mixins_(from.mixins_),
|
| + _cached_size_(0) {
|
| + _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (from.name().size() > 0) {
|
| + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
|
| + }
|
| + version_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (from.version().size() > 0) {
|
| + version_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.version_);
|
| + }
|
| + if (from.has_source_context()) {
|
| + source_context_ = new ::google::protobuf::SourceContext(*from.source_context_);
|
| + } else {
|
| + source_context_ = NULL;
|
| + }
|
| + syntax_ = from.syntax_;
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.Api)
|
| }
|
|
|
| void Api::SharedCtor() {
|
| - _is_default_instance_ = false;
|
| - ::google::protobuf::internal::GetEmptyString();
|
| - _cached_size_ = 0;
|
| name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| version_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - source_context_ = NULL;
|
| - syntax_ = 0;
|
| + ::memset(&source_context_, 0, reinterpret_cast<char*>(&syntax_) -
|
| + reinterpret_cast<char*>(&source_context_) + sizeof(syntax_));
|
| + _cached_size_ = 0;
|
| }
|
|
|
| Api::~Api() {
|
| @@ -234,7 +234,7 @@ Api::~Api() {
|
| void Api::SharedDtor() {
|
| name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| version_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - if (this != default_instance_) {
|
| + if (this != internal_default_instance()) {
|
| delete source_context_;
|
| }
|
| }
|
| @@ -246,16 +246,14 @@ void Api::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* Api::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return Api_descriptor_;
|
| + return file_level_metadata[0].descriptor;
|
| }
|
|
|
| const Api& Api::default_instance() {
|
| - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto();
|
| - return *default_instance_;
|
| + protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto();
|
| + return *internal_default_instance();
|
| }
|
|
|
| -Api* Api::default_instance_ = NULL;
|
| -
|
| Api* Api::New(::google::protobuf::Arena* arena) const {
|
| Api* n = new Api;
|
| if (arena != NULL) {
|
| @@ -266,14 +264,16 @@ Api* Api::New(::google::protobuf::Arena* arena) const {
|
|
|
| void Api::Clear() {
|
| // @@protoc_insertion_point(message_clear_start:google.protobuf.Api)
|
| + methods_.Clear();
|
| + options_.Clear();
|
| + mixins_.Clear();
|
| name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| version_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_;
|
| + if (GetArenaNoVirtual() == NULL && source_context_ != NULL) {
|
| + delete source_context_;
|
| + }
|
| source_context_ = NULL;
|
| syntax_ = 0;
|
| - methods_.Clear();
|
| - options_.Clear();
|
| - mixins_.Clear();
|
| }
|
|
|
| bool Api::MergePartialFromCodedStream(
|
| @@ -282,13 +282,13 @@ bool Api::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.Api)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (tag == 10u) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_name()));
|
| DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| @@ -298,47 +298,38 @@ bool Api::MergePartialFromCodedStream(
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(18)) goto parse_methods;
|
| break;
|
| }
|
|
|
| // repeated .google.protobuf.Method methods = 2;
|
| case 2: {
|
| - if (tag == 18) {
|
| - parse_methods:
|
| + if (tag == 18u) {
|
| DO_(input->IncrementRecursionDepth());
|
| - parse_loop_methods:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| input, add_methods()));
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(18)) goto parse_loop_methods;
|
| - if (input->ExpectTag(26)) goto parse_loop_options;
|
| input->UnsafeDecrementRecursionDepth();
|
| break;
|
| }
|
|
|
| // repeated .google.protobuf.Option options = 3;
|
| case 3: {
|
| - if (tag == 26) {
|
| + if (tag == 26u) {
|
| DO_(input->IncrementRecursionDepth());
|
| - parse_loop_options:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| input, add_options()));
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(26)) goto parse_loop_options;
|
| input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectTag(34)) goto parse_version;
|
| break;
|
| }
|
|
|
| - // optional string version = 4;
|
| + // string version = 4;
|
| case 4: {
|
| - if (tag == 34) {
|
| - parse_version:
|
| + if (tag == 34u) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_version()));
|
| DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| @@ -348,44 +339,36 @@ bool Api::MergePartialFromCodedStream(
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(42)) goto parse_source_context;
|
| break;
|
| }
|
|
|
| - // optional .google.protobuf.SourceContext source_context = 5;
|
| + // .google.protobuf.SourceContext source_context = 5;
|
| case 5: {
|
| - if (tag == 42) {
|
| - parse_source_context:
|
| + if (tag == 42u) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, mutable_source_context()));
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(50)) goto parse_mixins;
|
| break;
|
| }
|
|
|
| // repeated .google.protobuf.Mixin mixins = 6;
|
| case 6: {
|
| - if (tag == 50) {
|
| - parse_mixins:
|
| + if (tag == 50u) {
|
| DO_(input->IncrementRecursionDepth());
|
| - parse_loop_mixins:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| input, add_mixins()));
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(50)) goto parse_loop_mixins;
|
| input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectTag(56)) goto parse_syntax;
|
| break;
|
| }
|
|
|
| - // optional .google.protobuf.Syntax syntax = 7;
|
| + // .google.protobuf.Syntax syntax = 7;
|
| case 7: {
|
| - if (tag == 56) {
|
| - parse_syntax:
|
| + if (tag == 56u) {
|
| int value;
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
|
| @@ -394,7 +377,6 @@ bool Api::MergePartialFromCodedStream(
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -422,7 +404,7 @@ failure:
|
| void Api::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.Api)
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| if (this->name().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->name().data(), this->name().length(),
|
| @@ -444,7 +426,7 @@ void Api::SerializeWithCachedSizes(
|
| 3, this->options(i), output);
|
| }
|
|
|
| - // optional string version = 4;
|
| + // string version = 4;
|
| if (this->version().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->version().data(), this->version().length(),
|
| @@ -454,7 +436,7 @@ void Api::SerializeWithCachedSizes(
|
| 4, this->version(), output);
|
| }
|
|
|
| - // optional .google.protobuf.SourceContext source_context = 5;
|
| + // .google.protobuf.SourceContext source_context = 5;
|
| if (this->has_source_context()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 5, *this->source_context_, output);
|
| @@ -466,7 +448,7 @@ void Api::SerializeWithCachedSizes(
|
| 6, this->mixins(i), output);
|
| }
|
|
|
| - // optional .google.protobuf.Syntax syntax = 7;
|
| + // .google.protobuf.Syntax syntax = 7;
|
| if (this->syntax() != 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteEnum(
|
| 7, this->syntax(), output);
|
| @@ -475,10 +457,11 @@ void Api::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.Api)
|
| }
|
|
|
| -::google::protobuf::uint8* Api::SerializeWithCachedSizesToArray(
|
| - ::google::protobuf::uint8* target) const {
|
| +::google::protobuf::uint8* Api::InternalSerializeWithCachedSizesToArray(
|
| + bool deterministic, ::google::protobuf::uint8* target) const {
|
| + (void)deterministic; // Unused
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Api)
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| if (this->name().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->name().data(), this->name().length(),
|
| @@ -492,18 +475,18 @@ void Api::SerializeWithCachedSizes(
|
| // repeated .google.protobuf.Method methods = 2;
|
| for (unsigned int i = 0, n = this->methods_size(); i < n; i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| - WriteMessageNoVirtualToArray(
|
| - 2, this->methods(i), target);
|
| + InternalWriteMessageNoVirtualToArray(
|
| + 2, this->methods(i), false, target);
|
| }
|
|
|
| // repeated .google.protobuf.Option options = 3;
|
| for (unsigned int i = 0, n = this->options_size(); i < n; i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| - WriteMessageNoVirtualToArray(
|
| - 3, this->options(i), target);
|
| + InternalWriteMessageNoVirtualToArray(
|
| + 3, this->options(i), false, target);
|
| }
|
|
|
| - // optional string version = 4;
|
| + // string version = 4;
|
| if (this->version().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->version().data(), this->version().length(),
|
| @@ -514,21 +497,21 @@ void Api::SerializeWithCachedSizes(
|
| 4, this->version(), target);
|
| }
|
|
|
| - // optional .google.protobuf.SourceContext source_context = 5;
|
| + // .google.protobuf.SourceContext source_context = 5;
|
| if (this->has_source_context()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| - WriteMessageNoVirtualToArray(
|
| - 5, *this->source_context_, target);
|
| + InternalWriteMessageNoVirtualToArray(
|
| + 5, *this->source_context_, false, target);
|
| }
|
|
|
| // repeated .google.protobuf.Mixin mixins = 6;
|
| for (unsigned int i = 0, n = this->mixins_size(); i < n; i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| - WriteMessageNoVirtualToArray(
|
| - 6, this->mixins(i), target);
|
| + InternalWriteMessageNoVirtualToArray(
|
| + 6, this->mixins(i), false, target);
|
| }
|
|
|
| - // optional .google.protobuf.Syntax syntax = 7;
|
| + // .google.protobuf.Syntax syntax = 7;
|
| if (this->syntax() != 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
|
| 7, this->syntax(), target);
|
| @@ -538,71 +521,81 @@ void Api::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -int Api::ByteSize() const {
|
| +size_t Api::ByteSizeLong() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.Api)
|
| - int total_size = 0;
|
| + size_t total_size = 0;
|
| +
|
| + // repeated .google.protobuf.Method methods = 2;
|
| + {
|
| + unsigned int count = this->methods_size();
|
| + total_size += 1UL * count;
|
| + for (unsigned int i = 0; i < count; i++) {
|
| + total_size +=
|
| + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| + this->methods(i));
|
| + }
|
| + }
|
| +
|
| + // repeated .google.protobuf.Option options = 3;
|
| + {
|
| + unsigned int count = this->options_size();
|
| + total_size += 1UL * count;
|
| + for (unsigned int i = 0; i < count; i++) {
|
| + total_size +=
|
| + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| + this->options(i));
|
| + }
|
| + }
|
| +
|
| + // repeated .google.protobuf.Mixin mixins = 6;
|
| + {
|
| + unsigned int count = this->mixins_size();
|
| + total_size += 1UL * count;
|
| + for (unsigned int i = 0; i < count; i++) {
|
| + total_size +=
|
| + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| + this->mixins(i));
|
| + }
|
| + }
|
|
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| if (this->name().size() > 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->name());
|
| }
|
|
|
| - // optional string version = 4;
|
| + // string version = 4;
|
| if (this->version().size() > 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->version());
|
| }
|
|
|
| - // optional .google.protobuf.SourceContext source_context = 5;
|
| + // .google.protobuf.SourceContext source_context = 5;
|
| if (this->has_source_context()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| *this->source_context_);
|
| }
|
|
|
| - // optional .google.protobuf.Syntax syntax = 7;
|
| + // .google.protobuf.Syntax syntax = 7;
|
| if (this->syntax() != 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::EnumSize(this->syntax());
|
| }
|
|
|
| - // repeated .google.protobuf.Method methods = 2;
|
| - total_size += 1 * this->methods_size();
|
| - for (int i = 0; i < this->methods_size(); i++) {
|
| - total_size +=
|
| - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - this->methods(i));
|
| - }
|
| -
|
| - // repeated .google.protobuf.Option options = 3;
|
| - total_size += 1 * this->options_size();
|
| - for (int i = 0; i < this->options_size(); i++) {
|
| - total_size +=
|
| - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - this->options(i));
|
| - }
|
| -
|
| - // repeated .google.protobuf.Mixin mixins = 6;
|
| - total_size += 1 * this->mixins_size();
|
| - for (int i = 0; i < this->mixins_size(); i++) {
|
| - total_size +=
|
| - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - this->mixins(i));
|
| - }
|
| -
|
| + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = total_size;
|
| + _cached_size_ = cached_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void Api::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.Api)
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const Api* source =
|
| + GOOGLE_DCHECK_NE(&from, this);
|
| + const Api* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const Api>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -616,7 +609,8 @@ void Api::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void Api::MergeFrom(const Api& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Api)
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_DCHECK_NE(&from, this);
|
| + _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| methods_.MergeFrom(from.methods_);
|
| options_.MergeFrom(from.options_);
|
| mixins_.MergeFrom(from.mixins_);
|
| @@ -651,7 +645,6 @@ void Api::CopyFrom(const Api& from) {
|
| }
|
|
|
| bool Api::IsInitialized() const {
|
| -
|
| return true;
|
| }
|
|
|
| @@ -660,63 +653,59 @@ void Api::Swap(Api* other) {
|
| InternalSwap(other);
|
| }
|
| void Api::InternalSwap(Api* other) {
|
| - name_.Swap(&other->name_);
|
| methods_.UnsafeArenaSwap(&other->methods_);
|
| options_.UnsafeArenaSwap(&other->options_);
|
| + mixins_.UnsafeArenaSwap(&other->mixins_);
|
| + name_.Swap(&other->name_);
|
| version_.Swap(&other->version_);
|
| std::swap(source_context_, other->source_context_);
|
| - mixins_.UnsafeArenaSwap(&other->mixins_);
|
| std::swap(syntax_, other->syntax_);
|
| - _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata Api::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - ::google::protobuf::Metadata metadata;
|
| - metadata.descriptor = Api_descriptor_;
|
| - metadata.reflection = Api_reflection_;
|
| - return metadata;
|
| + return file_level_metadata[0];
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // Api
|
|
|
| -// optional string name = 1;
|
| +// string name = 1;
|
| void Api::clear_name() {
|
| name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - const ::std::string& Api::name() const {
|
| +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();
|
| }
|
| - void Api::set_name(const ::std::string& value) {
|
| +void Api::set_name(const ::std::string& value) {
|
|
|
| name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| // @@protoc_insertion_point(field_set:google.protobuf.Api.name)
|
| }
|
| - void Api::set_name(const char* value) {
|
| +void Api::set_name(const char* value) {
|
|
|
| name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| // @@protoc_insertion_point(field_set_char:google.protobuf.Api.name)
|
| }
|
| - void Api::set_name(const char* value, size_t size) {
|
| +void Api::set_name(const char* value, size_t size) {
|
|
|
| name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| ::std::string(reinterpret_cast<const char*>(value), size));
|
| // @@protoc_insertion_point(field_set_pointer:google.protobuf.Api.name)
|
| }
|
| - ::std::string* Api::mutable_name() {
|
| +::std::string* Api::mutable_name() {
|
|
|
| // @@protoc_insertion_point(field_mutable:google.protobuf.Api.name)
|
| return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - ::std::string* Api::release_name() {
|
| +::std::string* Api::release_name() {
|
| // @@protoc_insertion_point(field_release:google.protobuf.Api.name)
|
|
|
| return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - void Api::set_allocated_name(::std::string* name) {
|
| +void Api::set_allocated_name(::std::string* name) {
|
| if (name != NULL) {
|
|
|
| } else {
|
| @@ -786,41 +775,41 @@ Api::options() const {
|
| return options_;
|
| }
|
|
|
| -// optional string version = 4;
|
| +// string version = 4;
|
| void Api::clear_version() {
|
| version_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - const ::std::string& Api::version() const {
|
| +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();
|
| }
|
| - void Api::set_version(const ::std::string& value) {
|
| +void Api::set_version(const ::std::string& value) {
|
|
|
| version_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| // @@protoc_insertion_point(field_set:google.protobuf.Api.version)
|
| }
|
| - void Api::set_version(const char* value) {
|
| +void Api::set_version(const char* value) {
|
|
|
| version_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| // @@protoc_insertion_point(field_set_char:google.protobuf.Api.version)
|
| }
|
| - void Api::set_version(const char* value, size_t size) {
|
| +void Api::set_version(const char* value, size_t size) {
|
|
|
| version_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| ::std::string(reinterpret_cast<const char*>(value), size));
|
| // @@protoc_insertion_point(field_set_pointer:google.protobuf.Api.version)
|
| }
|
| - ::std::string* Api::mutable_version() {
|
| +::std::string* Api::mutable_version() {
|
|
|
| // @@protoc_insertion_point(field_mutable:google.protobuf.Api.version)
|
| return version_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - ::std::string* Api::release_version() {
|
| +::std::string* Api::release_version() {
|
| // @@protoc_insertion_point(field_release:google.protobuf.Api.version)
|
|
|
| return version_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - void Api::set_allocated_version(::std::string* version) {
|
| +void Api::set_allocated_version(::std::string* version) {
|
| if (version != NULL) {
|
|
|
| } else {
|
| @@ -830,9 +819,9 @@ void Api::clear_version() {
|
| // @@protoc_insertion_point(field_set_allocated:google.protobuf.Api.version)
|
| }
|
|
|
| -// optional .google.protobuf.SourceContext source_context = 5;
|
| +// .google.protobuf.SourceContext source_context = 5;
|
| bool Api::has_source_context() const {
|
| - return !_is_default_instance_ && source_context_ != NULL;
|
| + return this != internal_default_instance() && source_context_ != NULL;
|
| }
|
| void Api::clear_source_context() {
|
| if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_;
|
| @@ -840,7 +829,8 @@ void Api::clear_source_context() {
|
| }
|
| 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();
|
| }
|
| ::google::protobuf::SourceContext* Api::mutable_source_context() {
|
|
|
| @@ -898,15 +888,15 @@ Api::mixins() const {
|
| return mixins_;
|
| }
|
|
|
| -// optional .google.protobuf.Syntax syntax = 7;
|
| +// .google.protobuf.Syntax syntax = 7;
|
| void Api::clear_syntax() {
|
| syntax_ = 0;
|
| }
|
| - ::google::protobuf::Syntax Api::syntax() const {
|
| +::google::protobuf::Syntax Api::syntax() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.Api.syntax)
|
| return static_cast< ::google::protobuf::Syntax >(syntax_);
|
| }
|
| - void Api::set_syntax(::google::protobuf::Syntax value) {
|
| +void Api::set_syntax(::google::protobuf::Syntax value) {
|
|
|
| syntax_ = value;
|
| // @@protoc_insertion_point(field_set:google.protobuf.Api.syntax)
|
| @@ -928,32 +918,43 @@ const int Method::kSyntaxFieldNumber;
|
|
|
| Method::Method()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| + protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto();
|
| + }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.Method)
|
| }
|
| -
|
| -void Method::InitAsDefaultInstance() {
|
| - _is_default_instance_ = true;
|
| -}
|
| -
|
| Method::Method(const Method& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| - SharedCtor();
|
| - MergeFrom(from);
|
| + _internal_metadata_(NULL),
|
| + options_(from.options_),
|
| + _cached_size_(0) {
|
| + _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (from.name().size() > 0) {
|
| + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
|
| + }
|
| + request_type_url_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (from.request_type_url().size() > 0) {
|
| + request_type_url_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.request_type_url_);
|
| + }
|
| + response_type_url_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (from.response_type_url().size() > 0) {
|
| + response_type_url_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.response_type_url_);
|
| + }
|
| + ::memcpy(&request_streaming_, &from.request_streaming_,
|
| + reinterpret_cast<char*>(&syntax_) -
|
| + reinterpret_cast<char*>(&request_streaming_) + sizeof(syntax_));
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.Method)
|
| }
|
|
|
| void Method::SharedCtor() {
|
| - _is_default_instance_ = false;
|
| - ::google::protobuf::internal::GetEmptyString();
|
| - _cached_size_ = 0;
|
| name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| request_type_url_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - request_streaming_ = false;
|
| response_type_url_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - response_streaming_ = false;
|
| - syntax_ = 0;
|
| + ::memset(&request_streaming_, 0, reinterpret_cast<char*>(&syntax_) -
|
| + reinterpret_cast<char*>(&request_streaming_) + sizeof(syntax_));
|
| + _cached_size_ = 0;
|
| }
|
|
|
| Method::~Method() {
|
| @@ -965,8 +966,6 @@ void Method::SharedDtor() {
|
| name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| request_type_url_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| response_type_url_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - if (this != default_instance_) {
|
| - }
|
| }
|
|
|
| void Method::SetCachedSize(int size) const {
|
| @@ -976,16 +975,14 @@ void Method::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* Method::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return Method_descriptor_;
|
| + return file_level_metadata[1].descriptor;
|
| }
|
|
|
| const Method& Method::default_instance() {
|
| - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto();
|
| - return *default_instance_;
|
| + protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto();
|
| + return *internal_default_instance();
|
| }
|
|
|
| -Method* Method::default_instance_ = NULL;
|
| -
|
| Method* Method::New(::google::protobuf::Arena* arena) const {
|
| Method* n = new Method;
|
| if (arena != NULL) {
|
| @@ -996,31 +993,12 @@ Method* Method::New(::google::protobuf::Arena* arena) const {
|
|
|
| void Method::Clear() {
|
| // @@protoc_insertion_point(message_clear_start:google.protobuf.Method)
|
| -#if defined(__clang__)
|
| -#define ZR_HELPER_(f) \
|
| - _Pragma("clang diagnostic push") \
|
| - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \
|
| - __builtin_offsetof(Method, f) \
|
| - _Pragma("clang diagnostic pop")
|
| -#else
|
| -#define ZR_HELPER_(f) reinterpret_cast<char*>(\
|
| - &reinterpret_cast<Method*>(16)->f)
|
| -#endif
|
| -
|
| -#define ZR_(first, last) do {\
|
| - ::memset(&first, 0,\
|
| - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\
|
| -} while (0)
|
| -
|
| - ZR_(request_streaming_, syntax_);
|
| + options_.Clear();
|
| name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| request_type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| response_type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -
|
| -#undef ZR_HELPER_
|
| -#undef ZR_
|
| -
|
| - options_.Clear();
|
| + ::memset(&request_streaming_, 0, reinterpret_cast<char*>(&syntax_) -
|
| + reinterpret_cast<char*>(&request_streaming_) + sizeof(syntax_));
|
| }
|
|
|
| bool Method::MergePartialFromCodedStream(
|
| @@ -1029,13 +1007,13 @@ bool Method::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.Method)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (tag == 10u) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_name()));
|
| DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| @@ -1045,14 +1023,12 @@ bool Method::MergePartialFromCodedStream(
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(18)) goto parse_request_type_url;
|
| break;
|
| }
|
|
|
| - // optional string request_type_url = 2;
|
| + // string request_type_url = 2;
|
| case 2: {
|
| - if (tag == 18) {
|
| - parse_request_type_url:
|
| + if (tag == 18u) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_request_type_url()));
|
| DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| @@ -1062,29 +1038,25 @@ bool Method::MergePartialFromCodedStream(
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(24)) goto parse_request_streaming;
|
| break;
|
| }
|
|
|
| - // optional bool request_streaming = 3;
|
| + // bool request_streaming = 3;
|
| case 3: {
|
| - if (tag == 24) {
|
| - parse_request_streaming:
|
| + if (tag == 24u) {
|
| +
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
|
| input, &request_streaming_)));
|
| -
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(34)) goto parse_response_type_url;
|
| break;
|
| }
|
|
|
| - // optional string response_type_url = 4;
|
| + // string response_type_url = 4;
|
| case 4: {
|
| - if (tag == 34) {
|
| - parse_response_type_url:
|
| + if (tag == 34u) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_response_type_url()));
|
| DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| @@ -1094,46 +1066,38 @@ bool Method::MergePartialFromCodedStream(
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(40)) goto parse_response_streaming;
|
| break;
|
| }
|
|
|
| - // optional bool response_streaming = 5;
|
| + // bool response_streaming = 5;
|
| case 5: {
|
| - if (tag == 40) {
|
| - parse_response_streaming:
|
| + if (tag == 40u) {
|
| +
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
|
| input, &response_streaming_)));
|
| -
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(50)) goto parse_options;
|
| break;
|
| }
|
|
|
| // repeated .google.protobuf.Option options = 6;
|
| case 6: {
|
| - if (tag == 50) {
|
| - parse_options:
|
| + if (tag == 50u) {
|
| DO_(input->IncrementRecursionDepth());
|
| - parse_loop_options:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| input, add_options()));
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(50)) goto parse_loop_options;
|
| input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectTag(56)) goto parse_syntax;
|
| break;
|
| }
|
|
|
| - // optional .google.protobuf.Syntax syntax = 7;
|
| + // .google.protobuf.Syntax syntax = 7;
|
| case 7: {
|
| - if (tag == 56) {
|
| - parse_syntax:
|
| + if (tag == 56u) {
|
| int value;
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
|
| @@ -1142,7 +1106,6 @@ bool Method::MergePartialFromCodedStream(
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -1170,7 +1133,7 @@ failure:
|
| void Method::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.Method)
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| if (this->name().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->name().data(), this->name().length(),
|
| @@ -1180,7 +1143,7 @@ void Method::SerializeWithCachedSizes(
|
| 1, this->name(), output);
|
| }
|
|
|
| - // optional string request_type_url = 2;
|
| + // string request_type_url = 2;
|
| if (this->request_type_url().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->request_type_url().data(), this->request_type_url().length(),
|
| @@ -1190,12 +1153,12 @@ void Method::SerializeWithCachedSizes(
|
| 2, this->request_type_url(), output);
|
| }
|
|
|
| - // optional bool request_streaming = 3;
|
| + // bool request_streaming = 3;
|
| if (this->request_streaming() != 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->request_streaming(), output);
|
| }
|
|
|
| - // optional string response_type_url = 4;
|
| + // string response_type_url = 4;
|
| if (this->response_type_url().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->response_type_url().data(), this->response_type_url().length(),
|
| @@ -1205,7 +1168,7 @@ void Method::SerializeWithCachedSizes(
|
| 4, this->response_type_url(), output);
|
| }
|
|
|
| - // optional bool response_streaming = 5;
|
| + // bool response_streaming = 5;
|
| if (this->response_streaming() != 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->response_streaming(), output);
|
| }
|
| @@ -1216,7 +1179,7 @@ void Method::SerializeWithCachedSizes(
|
| 6, this->options(i), output);
|
| }
|
|
|
| - // optional .google.protobuf.Syntax syntax = 7;
|
| + // .google.protobuf.Syntax syntax = 7;
|
| if (this->syntax() != 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteEnum(
|
| 7, this->syntax(), output);
|
| @@ -1225,10 +1188,11 @@ void Method::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.Method)
|
| }
|
|
|
| -::google::protobuf::uint8* Method::SerializeWithCachedSizesToArray(
|
| - ::google::protobuf::uint8* target) const {
|
| +::google::protobuf::uint8* Method::InternalSerializeWithCachedSizesToArray(
|
| + bool deterministic, ::google::protobuf::uint8* target) const {
|
| + (void)deterministic; // Unused
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Method)
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| if (this->name().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->name().data(), this->name().length(),
|
| @@ -1239,7 +1203,7 @@ void Method::SerializeWithCachedSizes(
|
| 1, this->name(), target);
|
| }
|
|
|
| - // optional string request_type_url = 2;
|
| + // string request_type_url = 2;
|
| if (this->request_type_url().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->request_type_url().data(), this->request_type_url().length(),
|
| @@ -1250,12 +1214,12 @@ void Method::SerializeWithCachedSizes(
|
| 2, this->request_type_url(), target);
|
| }
|
|
|
| - // optional bool request_streaming = 3;
|
| + // bool request_streaming = 3;
|
| if (this->request_streaming() != 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->request_streaming(), target);
|
| }
|
|
|
| - // optional string response_type_url = 4;
|
| + // string response_type_url = 4;
|
| if (this->response_type_url().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->response_type_url().data(), this->response_type_url().length(),
|
| @@ -1266,7 +1230,7 @@ void Method::SerializeWithCachedSizes(
|
| 4, this->response_type_url(), target);
|
| }
|
|
|
| - // optional bool response_streaming = 5;
|
| + // bool response_streaming = 5;
|
| if (this->response_streaming() != 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->response_streaming(), target);
|
| }
|
| @@ -1274,11 +1238,11 @@ void Method::SerializeWithCachedSizes(
|
| // repeated .google.protobuf.Option options = 6;
|
| for (unsigned int i = 0, n = this->options_size(); i < n; i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| - WriteMessageNoVirtualToArray(
|
| - 6, this->options(i), target);
|
| + InternalWriteMessageNoVirtualToArray(
|
| + 6, this->options(i), false, target);
|
| }
|
|
|
| - // optional .google.protobuf.Syntax syntax = 7;
|
| + // .google.protobuf.Syntax syntax = 7;
|
| if (this->syntax() != 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
|
| 7, this->syntax(), target);
|
| @@ -1288,65 +1252,69 @@ void Method::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -int Method::ByteSize() const {
|
| +size_t Method::ByteSizeLong() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.Method)
|
| - int total_size = 0;
|
| + size_t total_size = 0;
|
| +
|
| + // repeated .google.protobuf.Option options = 6;
|
| + {
|
| + unsigned int count = this->options_size();
|
| + total_size += 1UL * count;
|
| + for (unsigned int i = 0; i < count; i++) {
|
| + total_size +=
|
| + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| + this->options(i));
|
| + }
|
| + }
|
|
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| if (this->name().size() > 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->name());
|
| }
|
|
|
| - // optional string request_type_url = 2;
|
| + // string request_type_url = 2;
|
| if (this->request_type_url().size() > 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->request_type_url());
|
| }
|
|
|
| - // optional bool request_streaming = 3;
|
| - if (this->request_streaming() != 0) {
|
| - total_size += 1 + 1;
|
| - }
|
| -
|
| - // optional string response_type_url = 4;
|
| + // string response_type_url = 4;
|
| if (this->response_type_url().size() > 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->response_type_url());
|
| }
|
|
|
| - // optional bool response_streaming = 5;
|
| + // bool request_streaming = 3;
|
| + if (this->request_streaming() != 0) {
|
| + total_size += 1 + 1;
|
| + }
|
| +
|
| + // bool response_streaming = 5;
|
| if (this->response_streaming() != 0) {
|
| total_size += 1 + 1;
|
| }
|
|
|
| - // optional .google.protobuf.Syntax syntax = 7;
|
| + // .google.protobuf.Syntax syntax = 7;
|
| if (this->syntax() != 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::EnumSize(this->syntax());
|
| }
|
|
|
| - // repeated .google.protobuf.Option options = 6;
|
| - total_size += 1 * this->options_size();
|
| - for (int i = 0; i < this->options_size(); i++) {
|
| - total_size +=
|
| - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - this->options(i));
|
| - }
|
| -
|
| + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = total_size;
|
| + _cached_size_ = cached_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void Method::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.Method)
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const Method* source =
|
| + GOOGLE_DCHECK_NE(&from, this);
|
| + const Method* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const Method>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -1360,7 +1328,8 @@ void Method::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void Method::MergeFrom(const Method& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Method)
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_DCHECK_NE(&from, this);
|
| + _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| options_.MergeFrom(from.options_);
|
| if (from.name().size() > 0) {
|
|
|
| @@ -1370,13 +1339,13 @@ void Method::MergeFrom(const Method& from) {
|
|
|
| request_type_url_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.request_type_url_);
|
| }
|
| - if (from.request_streaming() != 0) {
|
| - set_request_streaming(from.request_streaming());
|
| - }
|
| if (from.response_type_url().size() > 0) {
|
|
|
| response_type_url_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.response_type_url_);
|
| }
|
| + if (from.request_streaming() != 0) {
|
| + set_request_streaming(from.request_streaming());
|
| + }
|
| if (from.response_streaming() != 0) {
|
| set_response_streaming(from.response_streaming());
|
| }
|
| @@ -1400,7 +1369,6 @@ void Method::CopyFrom(const Method& from) {
|
| }
|
|
|
| bool Method::IsInitialized() const {
|
| -
|
| return true;
|
| }
|
|
|
| @@ -1409,63 +1377,59 @@ void Method::Swap(Method* other) {
|
| InternalSwap(other);
|
| }
|
| void Method::InternalSwap(Method* other) {
|
| + options_.UnsafeArenaSwap(&other->options_);
|
| name_.Swap(&other->name_);
|
| request_type_url_.Swap(&other->request_type_url_);
|
| - std::swap(request_streaming_, other->request_streaming_);
|
| response_type_url_.Swap(&other->response_type_url_);
|
| + std::swap(request_streaming_, other->request_streaming_);
|
| std::swap(response_streaming_, other->response_streaming_);
|
| - options_.UnsafeArenaSwap(&other->options_);
|
| std::swap(syntax_, other->syntax_);
|
| - _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata Method::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - ::google::protobuf::Metadata metadata;
|
| - metadata.descriptor = Method_descriptor_;
|
| - metadata.reflection = Method_reflection_;
|
| - return metadata;
|
| + return file_level_metadata[1];
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // Method
|
|
|
| -// optional string name = 1;
|
| +// string name = 1;
|
| void Method::clear_name() {
|
| name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - const ::std::string& Method::name() const {
|
| +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();
|
| }
|
| - void Method::set_name(const ::std::string& value) {
|
| +void Method::set_name(const ::std::string& value) {
|
|
|
| name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| // @@protoc_insertion_point(field_set:google.protobuf.Method.name)
|
| }
|
| - void Method::set_name(const char* value) {
|
| +void Method::set_name(const char* value) {
|
|
|
| name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| // @@protoc_insertion_point(field_set_char:google.protobuf.Method.name)
|
| }
|
| - void Method::set_name(const char* value, size_t size) {
|
| +void Method::set_name(const char* value, size_t size) {
|
|
|
| name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| ::std::string(reinterpret_cast<const char*>(value), size));
|
| // @@protoc_insertion_point(field_set_pointer:google.protobuf.Method.name)
|
| }
|
| - ::std::string* Method::mutable_name() {
|
| +::std::string* Method::mutable_name() {
|
|
|
| // @@protoc_insertion_point(field_mutable:google.protobuf.Method.name)
|
| return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - ::std::string* Method::release_name() {
|
| +::std::string* Method::release_name() {
|
| // @@protoc_insertion_point(field_release:google.protobuf.Method.name)
|
|
|
| return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - void Method::set_allocated_name(::std::string* name) {
|
| +void Method::set_allocated_name(::std::string* name) {
|
| if (name != NULL) {
|
|
|
| } else {
|
| @@ -1475,41 +1439,41 @@ void Method::clear_name() {
|
| // @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.name)
|
| }
|
|
|
| -// optional string request_type_url = 2;
|
| +// string request_type_url = 2;
|
| void Method::clear_request_type_url() {
|
| request_type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - const ::std::string& Method::request_type_url() const {
|
| +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();
|
| }
|
| - void Method::set_request_type_url(const ::std::string& value) {
|
| +void Method::set_request_type_url(const ::std::string& value) {
|
|
|
| request_type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| // @@protoc_insertion_point(field_set:google.protobuf.Method.request_type_url)
|
| }
|
| - void Method::set_request_type_url(const char* value) {
|
| +void Method::set_request_type_url(const char* value) {
|
|
|
| request_type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| // @@protoc_insertion_point(field_set_char:google.protobuf.Method.request_type_url)
|
| }
|
| - void Method::set_request_type_url(const char* value, size_t size) {
|
| +void Method::set_request_type_url(const char* value, size_t size) {
|
|
|
| request_type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| ::std::string(reinterpret_cast<const char*>(value), size));
|
| // @@protoc_insertion_point(field_set_pointer:google.protobuf.Method.request_type_url)
|
| }
|
| - ::std::string* Method::mutable_request_type_url() {
|
| +::std::string* Method::mutable_request_type_url() {
|
|
|
| // @@protoc_insertion_point(field_mutable:google.protobuf.Method.request_type_url)
|
| return request_type_url_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - ::std::string* Method::release_request_type_url() {
|
| +::std::string* Method::release_request_type_url() {
|
| // @@protoc_insertion_point(field_release:google.protobuf.Method.request_type_url)
|
|
|
| return request_type_url_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - void Method::set_allocated_request_type_url(::std::string* request_type_url) {
|
| +void Method::set_allocated_request_type_url(::std::string* request_type_url) {
|
| if (request_type_url != NULL) {
|
|
|
| } else {
|
| @@ -1519,55 +1483,55 @@ void Method::clear_request_type_url() {
|
| // @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.request_type_url)
|
| }
|
|
|
| -// optional bool request_streaming = 3;
|
| +// bool request_streaming = 3;
|
| void Method::clear_request_streaming() {
|
| request_streaming_ = false;
|
| }
|
| - bool Method::request_streaming() const {
|
| +bool Method::request_streaming() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.Method.request_streaming)
|
| return request_streaming_;
|
| }
|
| - void Method::set_request_streaming(bool value) {
|
| +void Method::set_request_streaming(bool value) {
|
|
|
| request_streaming_ = value;
|
| // @@protoc_insertion_point(field_set:google.protobuf.Method.request_streaming)
|
| }
|
|
|
| -// optional string response_type_url = 4;
|
| +// string response_type_url = 4;
|
| void Method::clear_response_type_url() {
|
| response_type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - const ::std::string& Method::response_type_url() const {
|
| +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();
|
| }
|
| - void Method::set_response_type_url(const ::std::string& value) {
|
| +void Method::set_response_type_url(const ::std::string& value) {
|
|
|
| response_type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| // @@protoc_insertion_point(field_set:google.protobuf.Method.response_type_url)
|
| }
|
| - void Method::set_response_type_url(const char* value) {
|
| +void Method::set_response_type_url(const char* value) {
|
|
|
| response_type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| // @@protoc_insertion_point(field_set_char:google.protobuf.Method.response_type_url)
|
| }
|
| - void Method::set_response_type_url(const char* value, size_t size) {
|
| +void Method::set_response_type_url(const char* value, size_t size) {
|
|
|
| response_type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| ::std::string(reinterpret_cast<const char*>(value), size));
|
| // @@protoc_insertion_point(field_set_pointer:google.protobuf.Method.response_type_url)
|
| }
|
| - ::std::string* Method::mutable_response_type_url() {
|
| +::std::string* Method::mutable_response_type_url() {
|
|
|
| // @@protoc_insertion_point(field_mutable:google.protobuf.Method.response_type_url)
|
| return response_type_url_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - ::std::string* Method::release_response_type_url() {
|
| +::std::string* Method::release_response_type_url() {
|
| // @@protoc_insertion_point(field_release:google.protobuf.Method.response_type_url)
|
|
|
| return response_type_url_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - void Method::set_allocated_response_type_url(::std::string* response_type_url) {
|
| +void Method::set_allocated_response_type_url(::std::string* response_type_url) {
|
| if (response_type_url != NULL) {
|
|
|
| } else {
|
| @@ -1577,15 +1541,15 @@ void Method::clear_response_type_url() {
|
| // @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.response_type_url)
|
| }
|
|
|
| -// optional bool response_streaming = 5;
|
| +// bool response_streaming = 5;
|
| void Method::clear_response_streaming() {
|
| response_streaming_ = false;
|
| }
|
| - bool Method::response_streaming() const {
|
| +bool Method::response_streaming() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.Method.response_streaming)
|
| return response_streaming_;
|
| }
|
| - void Method::set_response_streaming(bool value) {
|
| +void Method::set_response_streaming(bool value) {
|
|
|
| response_streaming_ = value;
|
| // @@protoc_insertion_point(field_set:google.protobuf.Method.response_streaming)
|
| @@ -1621,15 +1585,15 @@ Method::options() const {
|
| return options_;
|
| }
|
|
|
| -// optional .google.protobuf.Syntax syntax = 7;
|
| +// .google.protobuf.Syntax syntax = 7;
|
| void Method::clear_syntax() {
|
| syntax_ = 0;
|
| }
|
| - ::google::protobuf::Syntax Method::syntax() const {
|
| +::google::protobuf::Syntax Method::syntax() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.Method.syntax)
|
| return static_cast< ::google::protobuf::Syntax >(syntax_);
|
| }
|
| - void Method::set_syntax(::google::protobuf::Syntax value) {
|
| +void Method::set_syntax(::google::protobuf::Syntax value) {
|
|
|
| syntax_ = value;
|
| // @@protoc_insertion_point(field_set:google.protobuf.Method.syntax)
|
| @@ -1646,28 +1610,32 @@ const int Mixin::kRootFieldNumber;
|
|
|
| Mixin::Mixin()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| + protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto();
|
| + }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.Mixin)
|
| }
|
| -
|
| -void Mixin::InitAsDefaultInstance() {
|
| - _is_default_instance_ = true;
|
| -}
|
| -
|
| Mixin::Mixin(const Mixin& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| - SharedCtor();
|
| - MergeFrom(from);
|
| + _internal_metadata_(NULL),
|
| + _cached_size_(0) {
|
| + _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (from.name().size() > 0) {
|
| + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
|
| + }
|
| + root_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (from.root().size() > 0) {
|
| + root_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.root_);
|
| + }
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.Mixin)
|
| }
|
|
|
| void Mixin::SharedCtor() {
|
| - _is_default_instance_ = false;
|
| - ::google::protobuf::internal::GetEmptyString();
|
| - _cached_size_ = 0;
|
| name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| root_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + _cached_size_ = 0;
|
| }
|
|
|
| Mixin::~Mixin() {
|
| @@ -1678,8 +1646,6 @@ Mixin::~Mixin() {
|
| void Mixin::SharedDtor() {
|
| name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| root_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - if (this != default_instance_) {
|
| - }
|
| }
|
|
|
| void Mixin::SetCachedSize(int size) const {
|
| @@ -1689,16 +1655,14 @@ void Mixin::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* Mixin::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return Mixin_descriptor_;
|
| + return file_level_metadata[2].descriptor;
|
| }
|
|
|
| const Mixin& Mixin::default_instance() {
|
| - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto();
|
| - return *default_instance_;
|
| + protobuf_InitDefaults_google_2fprotobuf_2fapi_2eproto();
|
| + return *internal_default_instance();
|
| }
|
|
|
| -Mixin* Mixin::default_instance_ = NULL;
|
| -
|
| Mixin* Mixin::New(::google::protobuf::Arena* arena) const {
|
| Mixin* n = new Mixin;
|
| if (arena != NULL) {
|
| @@ -1719,13 +1683,13 @@ bool Mixin::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.Mixin)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (tag == 10u) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_name()));
|
| DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| @@ -1735,14 +1699,12 @@ bool Mixin::MergePartialFromCodedStream(
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectTag(18)) goto parse_root;
|
| break;
|
| }
|
|
|
| - // optional string root = 2;
|
| + // string root = 2;
|
| case 2: {
|
| - if (tag == 18) {
|
| - parse_root:
|
| + if (tag == 18u) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_root()));
|
| DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| @@ -1752,7 +1714,6 @@ bool Mixin::MergePartialFromCodedStream(
|
| } else {
|
| goto handle_unusual;
|
| }
|
| - if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -1780,7 +1741,7 @@ failure:
|
| void Mixin::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.Mixin)
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| if (this->name().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->name().data(), this->name().length(),
|
| @@ -1790,7 +1751,7 @@ void Mixin::SerializeWithCachedSizes(
|
| 1, this->name(), output);
|
| }
|
|
|
| - // optional string root = 2;
|
| + // string root = 2;
|
| if (this->root().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->root().data(), this->root().length(),
|
| @@ -1803,10 +1764,11 @@ void Mixin::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.Mixin)
|
| }
|
|
|
| -::google::protobuf::uint8* Mixin::SerializeWithCachedSizesToArray(
|
| - ::google::protobuf::uint8* target) const {
|
| +::google::protobuf::uint8* Mixin::InternalSerializeWithCachedSizesToArray(
|
| + bool deterministic, ::google::protobuf::uint8* target) const {
|
| + (void)deterministic; // Unused
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Mixin)
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| if (this->name().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->name().data(), this->name().length(),
|
| @@ -1817,7 +1779,7 @@ void Mixin::SerializeWithCachedSizes(
|
| 1, this->name(), target);
|
| }
|
|
|
| - // optional string root = 2;
|
| + // string root = 2;
|
| if (this->root().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->root().data(), this->root().length(),
|
| @@ -1832,34 +1794,35 @@ void Mixin::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -int Mixin::ByteSize() const {
|
| +size_t Mixin::ByteSizeLong() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.Mixin)
|
| - int total_size = 0;
|
| + size_t total_size = 0;
|
|
|
| - // optional string name = 1;
|
| + // string name = 1;
|
| if (this->name().size() > 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->name());
|
| }
|
|
|
| - // optional string root = 2;
|
| + // string root = 2;
|
| if (this->root().size() > 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->root());
|
| }
|
|
|
| + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = total_size;
|
| + _cached_size_ = cached_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void Mixin::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.Mixin)
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const Mixin* source =
|
| + GOOGLE_DCHECK_NE(&from, this);
|
| + const Mixin* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const Mixin>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -1873,7 +1836,8 @@ void Mixin::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void Mixin::MergeFrom(const Mixin& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Mixin)
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_DCHECK_NE(&from, this);
|
| + _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| if (from.name().size() > 0) {
|
|
|
| name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
|
| @@ -1899,7 +1863,6 @@ void Mixin::CopyFrom(const Mixin& from) {
|
| }
|
|
|
| bool Mixin::IsInitialized() const {
|
| -
|
| return true;
|
| }
|
|
|
| @@ -1910,56 +1873,52 @@ void Mixin::Swap(Mixin* other) {
|
| void Mixin::InternalSwap(Mixin* other) {
|
| name_.Swap(&other->name_);
|
| root_.Swap(&other->root_);
|
| - _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata Mixin::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - ::google::protobuf::Metadata metadata;
|
| - metadata.descriptor = Mixin_descriptor_;
|
| - metadata.reflection = Mixin_reflection_;
|
| - return metadata;
|
| + return file_level_metadata[2];
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // Mixin
|
|
|
| -// optional string name = 1;
|
| +// string name = 1;
|
| void Mixin::clear_name() {
|
| name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - const ::std::string& Mixin::name() const {
|
| +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();
|
| }
|
| - void Mixin::set_name(const ::std::string& value) {
|
| +void Mixin::set_name(const ::std::string& value) {
|
|
|
| name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| // @@protoc_insertion_point(field_set:google.protobuf.Mixin.name)
|
| }
|
| - void Mixin::set_name(const char* value) {
|
| +void Mixin::set_name(const char* value) {
|
|
|
| name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| // @@protoc_insertion_point(field_set_char:google.protobuf.Mixin.name)
|
| }
|
| - void Mixin::set_name(const char* value, size_t size) {
|
| +void Mixin::set_name(const char* value, size_t size) {
|
|
|
| name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| ::std::string(reinterpret_cast<const char*>(value), size));
|
| // @@protoc_insertion_point(field_set_pointer:google.protobuf.Mixin.name)
|
| }
|
| - ::std::string* Mixin::mutable_name() {
|
| +::std::string* Mixin::mutable_name() {
|
|
|
| // @@protoc_insertion_point(field_mutable:google.protobuf.Mixin.name)
|
| return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - ::std::string* Mixin::release_name() {
|
| +::std::string* Mixin::release_name() {
|
| // @@protoc_insertion_point(field_release:google.protobuf.Mixin.name)
|
|
|
| return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - void Mixin::set_allocated_name(::std::string* name) {
|
| +void Mixin::set_allocated_name(::std::string* name) {
|
| if (name != NULL) {
|
|
|
| } else {
|
| @@ -1969,41 +1928,41 @@ void Mixin::clear_name() {
|
| // @@protoc_insertion_point(field_set_allocated:google.protobuf.Mixin.name)
|
| }
|
|
|
| -// optional string root = 2;
|
| +// string root = 2;
|
| void Mixin::clear_root() {
|
| root_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - const ::std::string& Mixin::root() const {
|
| +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();
|
| }
|
| - void Mixin::set_root(const ::std::string& value) {
|
| +void Mixin::set_root(const ::std::string& value) {
|
|
|
| root_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| // @@protoc_insertion_point(field_set:google.protobuf.Mixin.root)
|
| }
|
| - void Mixin::set_root(const char* value) {
|
| +void Mixin::set_root(const char* value) {
|
|
|
| root_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| // @@protoc_insertion_point(field_set_char:google.protobuf.Mixin.root)
|
| }
|
| - void Mixin::set_root(const char* value, size_t size) {
|
| +void Mixin::set_root(const char* value, size_t size) {
|
|
|
| root_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| ::std::string(reinterpret_cast<const char*>(value), size));
|
| // @@protoc_insertion_point(field_set_pointer:google.protobuf.Mixin.root)
|
| }
|
| - ::std::string* Mixin::mutable_root() {
|
| +::std::string* Mixin::mutable_root() {
|
|
|
| // @@protoc_insertion_point(field_mutable:google.protobuf.Mixin.root)
|
| return root_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - ::std::string* Mixin::release_root() {
|
| +::std::string* Mixin::release_root() {
|
| // @@protoc_insertion_point(field_release:google.protobuf.Mixin.root)
|
|
|
| return root_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| - void Mixin::set_allocated_root(::std::string* root) {
|
| +void Mixin::set_allocated_root(::std::string* root) {
|
| if (root != NULL) {
|
|
|
| } else {
|
|
|