Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Solve merge conflict at gRPC-ProtoRPC.podspec

Browse Source
pull/7448/head
Jorge Canizales 9 years ago
parent a9b1c5cbe1 97f6994b98
commit 8ac55f8a8c
23 changed files with 165 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitmodules
  2. 2
      examples/cpp/helloworld/Makefile
  3. 2
      examples/cpp/route_guide/Makefile
  4. 2
      examples/objective-c/auth_sample/AuthTestService.podspec
  5. 2
      examples/objective-c/helloworld/HelloWorld.podspec
  6. 2
      examples/objective-c/route_guide/RouteGuide.podspec
  7. 8
      gRPC-ProtoRPC.podspec
  8. 6
      gRPC-RxLibrary.podspec
  9. 6
      gRPC.podspec
  10. 64
      include/grpc++/ext/reflection.pb.h
  11. 137
      src/cpp/ext/reflection.pb.cc
  12. 4
      src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
  13. 10
      src/objective-c/!ProtoCompiler.podspec
  14. 2
      src/objective-c/README.md
  15. 2
      src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
  16. 2
      src/objective-c/examples/SwiftSample/ViewController.swift
  17. 2
      src/objective-c/tests/RemoteTestClient/RemoteTest.podspec
  18. 2
      third_party/protobuf
  19. 2
      tools/codegen/extensions/gen_reflection_proto.sh
  20. 3
      tools/distrib/check_generated_pb_files.sh
  21. 1
      tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh
  22. 18
      tools/run_tests/run_tests.py
  23. 2
      tools/run_tests/sanity/check_submodules.sh

2
.gitmodules vendored
Unescape View File

@ -4,7 +4,7 @@
[submodule "third_party/protobuf"] [submodule "third_party/protobuf"]
path = third_party/protobuf path = third_party/protobuf
url = https://github.com/google/protobuf.git url = https://github.com/google/protobuf.git
branch = 3.0.0-beta-3 branch = 3.0.0-GA
[submodule "third_party/gflags"] [submodule "third_party/gflags"]
path = third_party/gflags path = third_party/gflags
url = https://github.com/gflags/gflags.git url = https://github.com/gflags/gflags.git

2
examples/cpp/helloworld/Makefile
Unescape View File

@ -99,7 +99,7 @@ ifneq ($(HAS_VALID_PROTOC),true)
@echo "Please install Google protocol buffers 3.0.0 and its compiler." @echo "Please install Google protocol buffers 3.0.0 and its compiler."
@echo "You can find it here:" @echo "You can find it here:"
@echo @echo
@echo " https://github.com/google/protobuf/releases/tag/v3.0.0-beta-3.3" @echo " https://github.com/google/protobuf/releases/tag/v3.0.0"
@echo @echo
@echo "Here is what I get when trying to evaluate your version of protoc:" @echo "Here is what I get when trying to evaluate your version of protoc:"
@echo @echo

2
examples/cpp/route_guide/Makefile
Unescape View File

@ -88,7 +88,7 @@ ifneq ($(HAS_VALID_PROTOC),true)
@echo "Please install Google protocol buffers 3.0.0 and its compiler." @echo "Please install Google protocol buffers 3.0.0 and its compiler."
@echo "You can find it here:" @echo "You can find it here:"
@echo @echo
@echo " https://github.com/google/protobuf/releases/tag/v3.0.0-beta-3.3" @echo " https://github.com/google/protobuf/releases/tag/v3.0.0"
@echo @echo
@echo "Here is what I get when trying to evaluate your version of protoc:" @echo "Here is what I get when trying to evaluate your version of protoc:"
@echo @echo

2
examples/objective-c/auth_sample/AuthTestService.podspec
Unescape View File

@ -14,7 +14,7 @@ Pod::Spec.new do |s|
src = "../../protos" src = "../../protos"
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1" s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2"
# Pods directory corresponding to this app's Podfile, relative to the location of this podspec. # Pods directory corresponding to this app's Podfile, relative to the location of this podspec.
pods_root = 'Pods' pods_root = 'Pods'

2
examples/objective-c/helloworld/HelloWorld.podspec
Unescape View File

@ -14,7 +14,7 @@ Pod::Spec.new do |s|
src = "../../protos" src = "../../protos"
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1" s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2"
# Pods directory corresponding to this app's Podfile, relative to the location of this podspec. # Pods directory corresponding to this app's Podfile, relative to the location of this podspec.
pods_root = 'Pods' pods_root = 'Pods'

2
examples/objective-c/route_guide/RouteGuide.podspec
Unescape View File

@ -14,7 +14,7 @@ Pod::Spec.new do |s|
src = "../../protos" src = "../../protos"
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1" s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2"
# Pods directory corresponding to this app's Podfile, relative to the location of this podspec. # Pods directory corresponding to this app's Podfile, relative to the location of this podspec.
pods_root = 'Pods' pods_root = 'Pods'

8
gRPC-ProtoRPC.podspec
Unescape View File

@ -1,9 +1,3 @@
# GRPC CocoaPods podspec
# This file has been automatically generated from a template file.
# Please look at the templates directory instead.
# This file can be regenerated from the template by running
# tools/buildgen/generate_projects.sh
# Copyright 2015, Google Inc. # Copyright 2015, Google Inc.
# All rights reserved. # All rights reserved.
# #
@ -61,7 +55,7 @@ Pod::Spec.new do |s|
s.dependency 'gRPC', version s.dependency 'gRPC', version
s.dependency 'gRPC-RxLibrary', version s.dependency 'gRPC-RxLibrary', version
s.dependency 'Protobuf', '~> 3.0.0-beta-3.1' s.dependency 'Protobuf', '~> 3.0'
s.pod_target_xcconfig = { s.pod_target_xcconfig = {
# This is needed by all pods that depend on Protobuf: # This is needed by all pods that depend on Protobuf:
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1', 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1',

6
gRPC-RxLibrary.podspec
Unescape View File

@ -1,9 +1,3 @@
# GRPC CocoaPods podspec
# This file has been automatically generated from a template file.
# Please look at the templates directory instead.
# This file can be regenerated from the template by running
# tools/buildgen/generate_projects.sh
# Copyright 2015, Google Inc. # Copyright 2015, Google Inc.
# All rights reserved. # All rights reserved.
# #

6
gRPC.podspec
Unescape View File

@ -1,9 +1,3 @@
# GRPC CocoaPods podspec
# This file has been automatically generated from a template file.
# Please look at the templates directory instead.
# This file can be regenerated from the template by running
# tools/buildgen/generate_projects.sh
# Copyright 2015, Google Inc. # Copyright 2015, Google Inc.
# All rights reserved. # All rights reserved.
# #

64
include/grpc++/ext/reflection.pb.h
Unescape View File

@ -83,7 +83,7 @@ class ServiceResponse;
// =================================================================== // ===================================================================
class ServerReflectionRequest : public ::google::protobuf::Message { class ServerReflectionRequest : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:grpc.reflection.v1alpha.ServerReflectionRequest) */ {
public: public:
ServerReflectionRequest(); ServerReflectionRequest();
virtual ~ServerReflectionRequest(); virtual ~ServerReflectionRequest();
@ -126,7 +126,11 @@ class ServerReflectionRequest : public ::google::protobuf::Message {
::google::protobuf::io::CodedInputStream* input); ::google::protobuf::io::CodedInputStream* input);
void SerializeWithCachedSizes( void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const; ::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {
return InternalSerializeWithCachedSizesToArray(false, output);
}
int GetCachedSize() const { return _cached_size_; } int GetCachedSize() const { return _cached_size_; }
private: private:
void SharedCtor(); void SharedCtor();
@ -260,7 +264,7 @@ class ServerReflectionRequest : public ::google::protobuf::Message {
}; };
// ------------------------------------------------------------------- // -------------------------------------------------------------------
class ExtensionRequest : public ::google::protobuf::Message { class ExtensionRequest : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:grpc.reflection.v1alpha.ExtensionRequest) */ {
public: public:
ExtensionRequest(); ExtensionRequest();
virtual ~ExtensionRequest(); virtual ~ExtensionRequest();
@ -294,7 +298,11 @@ class ExtensionRequest : public ::google::protobuf::Message {
::google::protobuf::io::CodedInputStream* input); ::google::protobuf::io::CodedInputStream* input);
void SerializeWithCachedSizes( void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const; ::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {
return InternalSerializeWithCachedSizesToArray(false, output);
}
int GetCachedSize() const { return _cached_size_; } int GetCachedSize() const { return _cached_size_; }
private: private:
void SharedCtor(); void SharedCtor();
@ -350,7 +358,7 @@ class ExtensionRequest : public ::google::protobuf::Message {
}; };
// ------------------------------------------------------------------- // -------------------------------------------------------------------
class ServerReflectionResponse : public ::google::protobuf::Message { class ServerReflectionResponse : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:grpc.reflection.v1alpha.ServerReflectionResponse) */ {
public: public:
ServerReflectionResponse(); ServerReflectionResponse();
virtual ~ServerReflectionResponse(); virtual ~ServerReflectionResponse();
@ -392,7 +400,11 @@ class ServerReflectionResponse : public ::google::protobuf::Message {
::google::protobuf::io::CodedInputStream* input); ::google::protobuf::io::CodedInputStream* input);
void SerializeWithCachedSizes( void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const; ::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {
return InternalSerializeWithCachedSizesToArray(false, output);
}
int GetCachedSize() const { return _cached_size_; } int GetCachedSize() const { return _cached_size_; }
private: private:
void SharedCtor(); void SharedCtor();
@ -505,7 +517,7 @@ class ServerReflectionResponse : public ::google::protobuf::Message {
}; };
// ------------------------------------------------------------------- // -------------------------------------------------------------------
class FileDescriptorResponse : public ::google::protobuf::Message { class FileDescriptorResponse : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:grpc.reflection.v1alpha.FileDescriptorResponse) */ {
public: public:
FileDescriptorResponse(); FileDescriptorResponse();
virtual ~FileDescriptorResponse(); virtual ~FileDescriptorResponse();
@ -539,7 +551,11 @@ class FileDescriptorResponse : public ::google::protobuf::Message {
::google::protobuf::io::CodedInputStream* input); ::google::protobuf::io::CodedInputStream* input);
void SerializeWithCachedSizes( void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const; ::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {
return InternalSerializeWithCachedSizesToArray(false, output);
}
int GetCachedSize() const { return _cached_size_; } int GetCachedSize() const { return _cached_size_; }
private: private:
void SharedCtor(); void SharedCtor();
@ -593,7 +609,7 @@ class FileDescriptorResponse : public ::google::protobuf::Message {
}; };
// ------------------------------------------------------------------- // -------------------------------------------------------------------
class ExtensionNumberResponse : public ::google::protobuf::Message { class ExtensionNumberResponse : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:grpc.reflection.v1alpha.ExtensionNumberResponse) */ {
public: public:
ExtensionNumberResponse(); ExtensionNumberResponse();
virtual ~ExtensionNumberResponse(); virtual ~ExtensionNumberResponse();
@ -627,7 +643,11 @@ class ExtensionNumberResponse : public ::google::protobuf::Message {
::google::protobuf::io::CodedInputStream* input); ::google::protobuf::io::CodedInputStream* input);
void SerializeWithCachedSizes( void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const; ::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {
return InternalSerializeWithCachedSizesToArray(false, output);
}
int GetCachedSize() const { return _cached_size_; } int GetCachedSize() const { return _cached_size_; }
private: private:
void SharedCtor(); void SharedCtor();
@ -690,7 +710,7 @@ class ExtensionNumberResponse : public ::google::protobuf::Message {
}; };
// ------------------------------------------------------------------- // -------------------------------------------------------------------
class ListServiceResponse : public ::google::protobuf::Message { class ListServiceResponse : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:grpc.reflection.v1alpha.ListServiceResponse) */ {
public: public:
ListServiceResponse(); ListServiceResponse();
virtual ~ListServiceResponse(); virtual ~ListServiceResponse();
@ -724,7 +744,11 @@ class ListServiceResponse : public ::google::protobuf::Message {
::google::protobuf::io::CodedInputStream* input); ::google::protobuf::io::CodedInputStream* input);
void SerializeWithCachedSizes( void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const; ::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {
return InternalSerializeWithCachedSizesToArray(false, output);
}
int GetCachedSize() const { return _cached_size_; } int GetCachedSize() const { return _cached_size_; }
private: private:
void SharedCtor(); void SharedCtor();
@ -774,7 +798,7 @@ class ListServiceResponse : public ::google::protobuf::Message {
}; };
// ------------------------------------------------------------------- // -------------------------------------------------------------------
class ServiceResponse : public ::google::protobuf::Message { class ServiceResponse : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:grpc.reflection.v1alpha.ServiceResponse) */ {
public: public:
ServiceResponse(); ServiceResponse();
virtual ~ServiceResponse(); virtual ~ServiceResponse();
@ -808,7 +832,11 @@ class ServiceResponse : public ::google::protobuf::Message {
::google::protobuf::io::CodedInputStream* input); ::google::protobuf::io::CodedInputStream* input);
void SerializeWithCachedSizes( void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const; ::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {
return InternalSerializeWithCachedSizesToArray(false, output);
}
int GetCachedSize() const { return _cached_size_; } int GetCachedSize() const { return _cached_size_; }
private: private:
void SharedCtor(); void SharedCtor();
@ -857,7 +885,7 @@ class ServiceResponse : public ::google::protobuf::Message {
}; };
// ------------------------------------------------------------------- // -------------------------------------------------------------------
class ErrorResponse : public ::google::protobuf::Message { class ErrorResponse : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:grpc.reflection.v1alpha.ErrorResponse) */ {
public: public:
ErrorResponse(); ErrorResponse();
virtual ~ErrorResponse(); virtual ~ErrorResponse();
@ -891,7 +919,11 @@ class ErrorResponse : public ::google::protobuf::Message {
::google::protobuf::io::CodedInputStream* input); ::google::protobuf::io::CodedInputStream* input);
void SerializeWithCachedSizes( void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const; ::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {
return InternalSerializeWithCachedSizesToArray(false, output);
}
int GetCachedSize() const { return _cached_size_; } int GetCachedSize() const { return _cached_size_; }
private: private:
void SharedCtor(); void SharedCtor();

137
src/cpp/ext/reflection.pb.cc
Unescape View File

@ -98,6 +98,7 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
} // namespace } // namespace
void protobuf_AssignDesc_reflection_2eproto() GOOGLE_ATTRIBUTE_COLD;
void protobuf_AssignDesc_reflection_2eproto() { void protobuf_AssignDesc_reflection_2eproto() {
protobuf_AddDesc_reflection_2eproto(); protobuf_AddDesc_reflection_2eproto();
const ::google::protobuf::FileDescriptor* file = const ::google::protobuf::FileDescriptor* file =
@ -253,6 +254,7 @@ inline void protobuf_AssignDescriptorsOnce() {
&protobuf_AssignDesc_reflection_2eproto); &protobuf_AssignDesc_reflection_2eproto);
} }
void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
void protobuf_RegisterTypes(const ::std::string&) { void protobuf_RegisterTypes(const ::std::string&) {
protobuf_AssignDescriptorsOnce(); protobuf_AssignDescriptorsOnce();
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@ -296,6 +298,7 @@ void protobuf_ShutdownFile_reflection_2eproto() {
delete ErrorResponse_reflection_; delete ErrorResponse_reflection_;
} }
void protobuf_AddDesc_reflection_2eproto() GOOGLE_ATTRIBUTE_COLD;
void protobuf_AddDesc_reflection_2eproto() { void protobuf_AddDesc_reflection_2eproto() {
static bool already_here = false; static bool already_here = false;
if (already_here) return; if (already_here) return;
@ -366,16 +369,6 @@ struct StaticDescriptorInitializer_reflection_2eproto {
} }
} static_descriptor_initializer_reflection_2eproto_; } static_descriptor_initializer_reflection_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 #if !defined(_MSC_VER) || _MSC_VER >= 1900
@ -684,8 +677,8 @@ void ServerReflectionRequest::SerializeWithCachedSizes(
// @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ServerReflectionRequest) // @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ServerReflectionRequest)
} }
::google::protobuf::uint8* ServerReflectionRequest::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* ServerReflectionRequest::InternalSerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const { bool deterministic, ::google::protobuf::uint8* target) const {
// @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ServerReflectionRequest) // @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ServerReflectionRequest)
// optional string host = 1; // optional string host = 1;
if (this->host().size() > 0) { if (this->host().size() > 0) {
@ -723,8 +716,8 @@ void ServerReflectionRequest::SerializeWithCachedSizes(
// optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5; // optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;
if (has_file_containing_extension()) { if (has_file_containing_extension()) {
target = ::google::protobuf::internal::WireFormatLite:: target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray( InternalWriteMessageNoVirtualToArray(
5, *message_request_.file_containing_extension_, target); 5, *message_request_.file_containing_extension_, false, target);
} }
// optional string all_extension_numbers_of_type = 6; // optional string all_extension_numbers_of_type = 6;
@ -812,7 +805,9 @@ int ServerReflectionRequest::ByteSize() const {
void ServerReflectionRequest::MergeFrom(const ::google::protobuf::Message& from) { void ServerReflectionRequest::MergeFrom(const ::google::protobuf::Message& from) {
// @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ServerReflectionRequest) // @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ServerReflectionRequest)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
const ServerReflectionRequest* source = const ServerReflectionRequest* source =
::google::protobuf::internal::DynamicCastToGenerated<const ServerReflectionRequest>( ::google::protobuf::internal::DynamicCastToGenerated<const ServerReflectionRequest>(
&from); &from);
@ -827,7 +822,9 @@ void ServerReflectionRequest::MergeFrom(const ::google::protobuf::Message& from)
void ServerReflectionRequest::MergeFrom(const ServerReflectionRequest& from) { void ServerReflectionRequest::MergeFrom(const ServerReflectionRequest& from) {
// @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ServerReflectionRequest) // @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ServerReflectionRequest)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
switch (from.message_request_case()) { switch (from.message_request_case()) {
case kFileByFilename: { case kFileByFilename: {
set_file_by_filename(from.file_by_filename()); set_file_by_filename(from.file_by_filename());
@ -1486,8 +1483,8 @@ void ExtensionRequest::SerializeWithCachedSizes(
// @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ExtensionRequest) // @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ExtensionRequest)
} }
::google::protobuf::uint8* ExtensionRequest::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* ExtensionRequest::InternalSerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const { bool deterministic, ::google::protobuf::uint8* target) const {
// @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ExtensionRequest) // @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ExtensionRequest)
// optional string containing_type = 1; // optional string containing_type = 1;
if (this->containing_type().size() > 0) { if (this->containing_type().size() > 0) {
@ -1535,7 +1532,9 @@ int ExtensionRequest::ByteSize() const {
void ExtensionRequest::MergeFrom(const ::google::protobuf::Message& from) { void ExtensionRequest::MergeFrom(const ::google::protobuf::Message& from) {
// @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ExtensionRequest) // @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ExtensionRequest)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
const ExtensionRequest* source = const ExtensionRequest* source =
::google::protobuf::internal::DynamicCastToGenerated<const ExtensionRequest>( ::google::protobuf::internal::DynamicCastToGenerated<const ExtensionRequest>(
&from); &from);
@ -1550,7 +1549,9 @@ void ExtensionRequest::MergeFrom(const ::google::protobuf::Message& from) {
void ExtensionRequest::MergeFrom(const ExtensionRequest& from) { void ExtensionRequest::MergeFrom(const ExtensionRequest& from) {
// @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ExtensionRequest) // @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ExtensionRequest)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
if (from.containing_type().size() > 0) { if (from.containing_type().size() > 0) {
containing_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.containing_type_); containing_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.containing_type_);
@ -1937,8 +1938,8 @@ void ServerReflectionResponse::SerializeWithCachedSizes(
// @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ServerReflectionResponse) // @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ServerReflectionResponse)
} }
::google::protobuf::uint8* ServerReflectionResponse::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* ServerReflectionResponse::InternalSerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const { bool deterministic, ::google::protobuf::uint8* target) const {
// @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ServerReflectionResponse) // @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ServerReflectionResponse)
// optional string valid_host = 1; // optional string valid_host = 1;
if (this->valid_host().size() > 0) { if (this->valid_host().size() > 0) {
@ -1954,36 +1955,36 @@ void ServerReflectionResponse::SerializeWithCachedSizes(
// optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2; // optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;
if (this->has_original_request()) { if (this->has_original_request()) {
target = ::google::protobuf::internal::WireFormatLite:: target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray( InternalWriteMessageNoVirtualToArray(
2, *this->original_request_, target); 2, *this->original_request_, false, target);
} }
// optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4; // optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;
if (has_file_descriptor_response()) { if (has_file_descriptor_response()) {
target = ::google::protobuf::internal::WireFormatLite:: target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray( InternalWriteMessageNoVirtualToArray(
4, *message_response_.file_descriptor_response_, target); 4, *message_response_.file_descriptor_response_, false, target);
} }
// optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5; // optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;
if (has_all_extension_numbers_response()) { if (has_all_extension_numbers_response()) {
target = ::google::protobuf::internal::WireFormatLite:: target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray( InternalWriteMessageNoVirtualToArray(
5, *message_response_.all_extension_numbers_response_, target); 5, *message_response_.all_extension_numbers_response_, false, target);
} }
// optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6; // optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;
if (has_list_services_response()) { if (has_list_services_response()) {
target = ::google::protobuf::internal::WireFormatLite:: target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray( InternalWriteMessageNoVirtualToArray(
6, *message_response_.list_services_response_, target); 6, *message_response_.list_services_response_, false, target);
} }
// optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7; // optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;
if (has_error_response()) { if (has_error_response()) {
target = ::google::protobuf::internal::WireFormatLite:: target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray( InternalWriteMessageNoVirtualToArray(
7, *message_response_.error_response_, target); 7, *message_response_.error_response_, false, target);
} }
// @@protoc_insertion_point(serialize_to_array_end:grpc.reflection.v1alpha.ServerReflectionResponse) // @@protoc_insertion_point(serialize_to_array_end:grpc.reflection.v1alpha.ServerReflectionResponse)
@ -2049,7 +2050,9 @@ int ServerReflectionResponse::ByteSize() const {
void ServerReflectionResponse::MergeFrom(const ::google::protobuf::Message& from) { void ServerReflectionResponse::MergeFrom(const ::google::protobuf::Message& from) {
// @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ServerReflectionResponse) // @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ServerReflectionResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
const ServerReflectionResponse* source = const ServerReflectionResponse* source =
::google::protobuf::internal::DynamicCastToGenerated<const ServerReflectionResponse>( ::google::protobuf::internal::DynamicCastToGenerated<const ServerReflectionResponse>(
&from); &from);
@ -2064,7 +2067,9 @@ void ServerReflectionResponse::MergeFrom(const ::google::protobuf::Message& from
void ServerReflectionResponse::MergeFrom(const ServerReflectionResponse& from) { void ServerReflectionResponse::MergeFrom(const ServerReflectionResponse& from) {
// @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ServerReflectionResponse) // @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ServerReflectionResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
switch (from.message_response_case()) { switch (from.message_response_case()) {
case kFileDescriptorResponse: { case kFileDescriptorResponse: {
mutable_file_descriptor_response()->::grpc::reflection::v1alpha::FileDescriptorResponse::MergeFrom(from.file_descriptor_response()); mutable_file_descriptor_response()->::grpc::reflection::v1alpha::FileDescriptorResponse::MergeFrom(from.file_descriptor_response());
@ -2550,8 +2555,8 @@ void FileDescriptorResponse::SerializeWithCachedSizes(
// @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.FileDescriptorResponse) // @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.FileDescriptorResponse)
} }
::google::protobuf::uint8* FileDescriptorResponse::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* FileDescriptorResponse::InternalSerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const { bool deterministic, ::google::protobuf::uint8* target) const {
// @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.FileDescriptorResponse) // @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.FileDescriptorResponse)
// repeated bytes file_descriptor_proto = 1; // repeated bytes file_descriptor_proto = 1;
for (int i = 0; i < this->file_descriptor_proto_size(); i++) { for (int i = 0; i < this->file_descriptor_proto_size(); i++) {
@ -2582,7 +2587,9 @@ int FileDescriptorResponse::ByteSize() const {
void FileDescriptorResponse::MergeFrom(const ::google::protobuf::Message& from) { void FileDescriptorResponse::MergeFrom(const ::google::protobuf::Message& from) {
// @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.FileDescriptorResponse) // @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.FileDescriptorResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
const FileDescriptorResponse* source = const FileDescriptorResponse* source =
::google::protobuf::internal::DynamicCastToGenerated<const FileDescriptorResponse>( ::google::protobuf::internal::DynamicCastToGenerated<const FileDescriptorResponse>(
&from); &from);
@ -2597,7 +2604,9 @@ void FileDescriptorResponse::MergeFrom(const ::google::protobuf::Message& from)
void FileDescriptorResponse::MergeFrom(const FileDescriptorResponse& from) { void FileDescriptorResponse::MergeFrom(const FileDescriptorResponse& from) {
// @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.FileDescriptorResponse) // @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.FileDescriptorResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
file_descriptor_proto_.MergeFrom(from.file_descriptor_proto_); file_descriptor_proto_.MergeFrom(from.file_descriptor_proto_);
} }
@ -2863,8 +2872,8 @@ void ExtensionNumberResponse::SerializeWithCachedSizes(
// @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ExtensionNumberResponse) // @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ExtensionNumberResponse)
} }
::google::protobuf::uint8* ExtensionNumberResponse::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* ExtensionNumberResponse::InternalSerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const { bool deterministic, ::google::protobuf::uint8* target) const {
// @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ExtensionNumberResponse) // @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ExtensionNumberResponse)
// optional string base_type_name = 1; // optional string base_type_name = 1;
if (this->base_type_name().size() > 0) { if (this->base_type_name().size() > 0) {
@ -2931,7 +2940,9 @@ int ExtensionNumberResponse::ByteSize() const {
void ExtensionNumberResponse::MergeFrom(const ::google::protobuf::Message& from) { void ExtensionNumberResponse::MergeFrom(const ::google::protobuf::Message& from) {
// @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ExtensionNumberResponse) // @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ExtensionNumberResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
const ExtensionNumberResponse* source = const ExtensionNumberResponse* source =
::google::protobuf::internal::DynamicCastToGenerated<const ExtensionNumberResponse>( ::google::protobuf::internal::DynamicCastToGenerated<const ExtensionNumberResponse>(
&from); &from);
@ -2946,7 +2957,9 @@ void ExtensionNumberResponse::MergeFrom(const ::google::protobuf::Message& from)
void ExtensionNumberResponse::MergeFrom(const ExtensionNumberResponse& from) { void ExtensionNumberResponse::MergeFrom(const ExtensionNumberResponse& from) {
// @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ExtensionNumberResponse) // @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ExtensionNumberResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
extension_number_.MergeFrom(from.extension_number_); extension_number_.MergeFrom(from.extension_number_);
if (from.base_type_name().size() > 0) { if (from.base_type_name().size() > 0) {
@ -3199,14 +3212,14 @@ void ListServiceResponse::SerializeWithCachedSizes(
// @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ListServiceResponse) // @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ListServiceResponse)
} }
::google::protobuf::uint8* ListServiceResponse::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* ListServiceResponse::InternalSerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const { bool deterministic, ::google::protobuf::uint8* target) const {
// @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ListServiceResponse) // @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ListServiceResponse)
// repeated .grpc.reflection.v1alpha.ServiceResponse service = 1; // repeated .grpc.reflection.v1alpha.ServiceResponse service = 1;
for (unsigned int i = 0, n = this->service_size(); i < n; i++) { for (unsigned int i = 0, n = this->service_size(); i < n; i++) {
target = ::google::protobuf::internal::WireFormatLite:: target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray( InternalWriteMessageNoVirtualToArray(
1, this->service(i), target); 1, this->service(i), false, target);
} }
// @@protoc_insertion_point(serialize_to_array_end:grpc.reflection.v1alpha.ListServiceResponse) // @@protoc_insertion_point(serialize_to_array_end:grpc.reflection.v1alpha.ListServiceResponse)
@ -3233,7 +3246,9 @@ int ListServiceResponse::ByteSize() const {
void ListServiceResponse::MergeFrom(const ::google::protobuf::Message& from) { void ListServiceResponse::MergeFrom(const ::google::protobuf::Message& from) {
// @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ListServiceResponse) // @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ListServiceResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
const ListServiceResponse* source = const ListServiceResponse* source =
::google::protobuf::internal::DynamicCastToGenerated<const ListServiceResponse>( ::google::protobuf::internal::DynamicCastToGenerated<const ListServiceResponse>(
&from); &from);
@ -3248,7 +3263,9 @@ void ListServiceResponse::MergeFrom(const ::google::protobuf::Message& from) {
void ListServiceResponse::MergeFrom(const ListServiceResponse& from) { void ListServiceResponse::MergeFrom(const ListServiceResponse& from) {
// @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ListServiceResponse) // @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ListServiceResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
service_.MergeFrom(from.service_); service_.MergeFrom(from.service_);
} }
@ -3459,8 +3476,8 @@ void ServiceResponse::SerializeWithCachedSizes(
// @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ServiceResponse) // @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ServiceResponse)
} }
::google::protobuf::uint8* ServiceResponse::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* ServiceResponse::InternalSerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const { bool deterministic, ::google::protobuf::uint8* target) const {
// @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ServiceResponse) // @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ServiceResponse)
// optional string name = 1; // optional string name = 1;
if (this->name().size() > 0) { if (this->name().size() > 0) {
@ -3496,7 +3513,9 @@ int ServiceResponse::ByteSize() const {
void ServiceResponse::MergeFrom(const ::google::protobuf::Message& from) { void ServiceResponse::MergeFrom(const ::google::protobuf::Message& from) {
// @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ServiceResponse) // @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ServiceResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
const ServiceResponse* source = const ServiceResponse* source =
::google::protobuf::internal::DynamicCastToGenerated<const ServiceResponse>( ::google::protobuf::internal::DynamicCastToGenerated<const ServiceResponse>(
&from); &from);
@ -3511,7 +3530,9 @@ void ServiceResponse::MergeFrom(const ::google::protobuf::Message& from) {
void ServiceResponse::MergeFrom(const ServiceResponse& from) { void ServiceResponse::MergeFrom(const ServiceResponse& from) {
// @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ServiceResponse) // @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ServiceResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
if (from.name().size() > 0) { if (from.name().size() > 0) {
name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
@ -3762,8 +3783,8 @@ void ErrorResponse::SerializeWithCachedSizes(
// @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ErrorResponse) // @@protoc_insertion_point(serialize_end:grpc.reflection.v1alpha.ErrorResponse)
} }
::google::protobuf::uint8* ErrorResponse::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* ErrorResponse::InternalSerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const { bool deterministic, ::google::protobuf::uint8* target) const {
// @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ErrorResponse) // @@protoc_insertion_point(serialize_to_array_start:grpc.reflection.v1alpha.ErrorResponse)
// optional int32 error_code = 1; // optional int32 error_code = 1;
if (this->error_code() != 0) { if (this->error_code() != 0) {
@ -3811,7 +3832,9 @@ int ErrorResponse::ByteSize() const {
void ErrorResponse::MergeFrom(const ::google::protobuf::Message& from) { void ErrorResponse::MergeFrom(const ::google::protobuf::Message& from) {
// @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ErrorResponse) // @@protoc_insertion_point(generalized_merge_from_start:grpc.reflection.v1alpha.ErrorResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
const ErrorResponse* source = const ErrorResponse* source =
::google::protobuf::internal::DynamicCastToGenerated<const ErrorResponse>( ::google::protobuf::internal::DynamicCastToGenerated<const ErrorResponse>(
&from); &from);
@ -3826,7 +3849,9 @@ void ErrorResponse::MergeFrom(const ::google::protobuf::Message& from) {
void ErrorResponse::MergeFrom(const ErrorResponse& from) { void ErrorResponse::MergeFrom(const ErrorResponse& from) {
// @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ErrorResponse) // @@protoc_insertion_point(class_specific_merge_from_start:grpc.reflection.v1alpha.ErrorResponse)
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); if (GOOGLE_PREDICT_FALSE(&from == this)) {
::google::protobuf::internal::MergeFromFail(__FILE__, __LINE__);
}
if (from.error_code() != 0) { if (from.error_code() != 0) {
set_error_code(from.error_code()); set_error_code(from.error_code());
} }

4
src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
Unescape View File

@ -37,7 +37,7 @@ Pod::Spec.new do |s|
# before them. # before them.
s.name = '!ProtoCompiler-gRPCPlugin' s.name = '!ProtoCompiler-gRPCPlugin'
v = '1.0.0-pre1' v = '1.0.0-pre1'
s.version = v s.version = "#{v}.2" # .2 to depend on protoc 3.0.0
s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.' s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
s.description = <<-DESC s.description = <<-DESC
This podspec only downloads the gRPC protoc plugin so that local pods generating protos can use This podspec only downloads the gRPC protoc plugin so that local pods generating protos can use
@ -96,7 +96,7 @@ Pod::Spec.new do |s|
s.preserve_paths = plugin s.preserve_paths = plugin
# Restrict the protoc version to the one supported by this plugin. # Restrict the protoc version to the one supported by this plugin.
s.dependency '!ProtoCompiler', '3.0.0-beta-3.1' s.dependency '!ProtoCompiler', '3.0.0'
# For the Protobuf dependency not to complain: # For the Protobuf dependency not to complain:
s.ios.deployment_target = '7.1' s.ios.deployment_target = '7.1'
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'

10
src/objective-c/!ProtoCompiler.podspec
Unescape View File

@ -36,7 +36,7 @@ Pod::Spec.new do |s|
# exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
# before them. # before them.
s.name = '!ProtoCompiler' s.name = '!ProtoCompiler'
v = '3.0.0-beta-3.1' v = '3.0.0'
s.version = v s.version = v
s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files' s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
s.description = <<-DESC s.description = <<-DESC
@ -108,7 +108,7 @@ Pod::Spec.new do |s|
'google/**/*.proto' # Well-known protobuf types 'google/**/*.proto' # Well-known protobuf types
# Restrict the protobuf runtime version to the one supported by this version of protoc. # Restrict the protobuf runtime version to the one supported by this version of protoc.
s.dependency 'Protobuf', v s.dependency 'Protobuf', '~> 3.0'
# For the Protobuf dependency not to complain: # For the Protobuf dependency not to complain:
s.ios.deployment_target = '7.1' s.ios.deployment_target = '7.1'
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'
@ -120,7 +120,7 @@ Pod::Spec.new do |s|
repo_root = '../..' repo_root = '../..'
plugin = 'grpc_objective_c_plugin' plugin = 'grpc_objective_c_plugin'
s.prepare_command = <<-CMD s.prepare_command = <<-CMD
if [ ! -f protoc ]; then if [ ! -f bin/protoc ]; then
cd #{repo_root} cd #{repo_root}
# This will build protoc from the Protobuf submodule of gRPC, and put it in # This will build protoc from the Protobuf submodule of gRPC, and put it in
# #{repo_root}/bins/opt/protobuf. # #{repo_root}/bins/opt/protobuf.
@ -129,7 +129,9 @@ Pod::Spec.new do |s|
# _we do not want_. Find a way for this to always build from source. # _we do not want_. Find a way for this to always build from source.
make #{plugin} make #{plugin}
cd - cd -
else
mv bin/protoc .
mv include/google .
fi fi
CMD CMD
end end

2
src/objective-c/README.md
Unescape View File

@ -48,7 +48,7 @@ Pod::Spec.new do |s|
src = '.' src = '.'
# We'll use protoc with the gRPC plugin. # We'll use protoc with the gRPC plugin.
s.dependency '!ProtoCompiler-gRPCPlugin', '~> 1.0.0-pre1' s.dependency '!ProtoCompiler-gRPCPlugin', '~> 1.0.0-pre1.2'
# Pods directory corresponding to this app's Podfile, relative to the location of this podspec. # Pods directory corresponding to this app's Podfile, relative to the location of this podspec.
pods_root = '<path to your Podfile>/Pods' pods_root = '<path to your Podfile>/Pods'

2
src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
Unescape View File

@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1" s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2"
repo_root = '../../../..' repo_root = '../../../..'
bin_dir = "#{repo_root}/bins/$CONFIG" bin_dir = "#{repo_root}/bins/$CONFIG"

2
src/objective-c/examples/SwiftSample/ViewController.swift
Unescape View File

@ -91,7 +91,7 @@ class ViewController: UIViewController {
call.startWithWriteable(GRXWriteable { response, error in call.startWithWriteable(GRXWriteable { response, error in
if let response = response as? NSData { if let response = response as? NSData {
NSLog("3. Received response:\n\(RMTSimpleResponse(data: response, error: nil))") NSLog("3. Received response:\n\(try! RMTSimpleResponse(data: response))")
} else { } else {
NSLog("3. Finished with error: \(error!)") NSLog("3. Finished with error: \(error!)")
} }

2
src/objective-c/tests/RemoteTestClient/RemoteTest.podspec
Unescape View File

@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1" s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2"
repo_root = '../../../..' repo_root = '../../../..'
bin_dir = "#{repo_root}/bins/$CONFIG" bin_dir = "#{repo_root}/bins/$CONFIG"

2
third_party/protobuf vendored

@ -1 +1 @@
Subproject commit bdeb215cab2985195325fcd5e70c3fa751f46e0f Subproject commit e8ae137c96444ea313485ed1118c5e43b2099cf1

2
tools/codegen/extensions/gen_reflection_proto.sh
Unescape View File

@ -36,7 +36,7 @@ SRC_DIR="src/cpp/ext"
INCLUDE_DIR="grpc++/ext" INCLUDE_DIR="grpc++/ext"
TMP_DIR="tmp" TMP_DIR="tmp"
GRPC_PLUGIN="bins/opt/grpc_cpp_plugin" GRPC_PLUGIN="bins/opt/grpc_cpp_plugin"
PROTOC=third_party/protobuf/src/protoc PROTOC="bins/opt/protobuf/protoc"
set -e set -e

3
tools/distrib/check_generated_pb_files.sh
Unescape View File

@ -38,3 +38,6 @@ docker build -t grpc_check_generated_pb_files tools/dockerfile/grpc_check_genera
# run check_pb_files against the checked out codebase # run check_pb_files against the checked out codebase
docker run -e TEST=$TEST --rm=true -v ${HOST_GIT_ROOT:-`pwd`}:/var/local/jenkins/grpc -t grpc_check_generated_pb_files /var/local/jenkins/grpc/tools/dockerfile/grpc_check_generated_pb_files/check_pb_files.sh docker run -e TEST=$TEST --rm=true -v ${HOST_GIT_ROOT:-`pwd`}:/var/local/jenkins/grpc -t grpc_check_generated_pb_files /var/local/jenkins/grpc/tools/dockerfile/grpc_check_generated_pb_files/check_pb_files.sh
# If the test fails, please make sure your protobuf submodule is up-to-date and run
# tools/codegen/extensions/gen_reflection_proto.sh to update the generated files.

1
tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh
Unescape View File

@ -46,6 +46,7 @@ go get github.com/golang/protobuf/proto
go get golang.org/x/net/context go get golang.org/x/net/context
go get golang.org/x/net/trace go get golang.org/x/net/trace
go get golang.org/x/oauth2 go get golang.org/x/oauth2
go get golang.org/x/oauth2/google
go get google.golang.org/cloud go get google.golang.org/cloud
# Build the interop client and server # Build the interop client and server

18
tools/run_tests/run_tests.py
Unescape View File

@ -690,14 +690,16 @@ class ObjCLanguage(object):
_check_compiler(self.args.compiler, ['default']) _check_compiler(self.args.compiler, ['default'])
def test_specs(self): def test_specs(self):
return [self.config.job_spec(['src/objective-c/tests/run_tests.sh'], return [
timeout_seconds=None, self.config.job_spec(['src/objective-c/tests/run_tests.sh'],
shortname='objc-tests', timeout_seconds=None,
environ=_FORCE_ENVIRON_FOR_WRAPPERS), shortname='objc-tests',
self.config.job_spec(['src/objective-c/tests/build_example_test.sh'], environ=_FORCE_ENVIRON_FOR_WRAPPERS),
timeout_seconds=15*60, self.config.job_spec(['src/objective-c/tests/build_example_test.sh'],
shortname='objc-examples-build', timeout_seconds=15*60,
environ=_FORCE_ENVIRON_FOR_WRAPPERS)] shortname='objc-examples-build',
environ=_FORCE_ENVIRON_FOR_WRAPPERS),
]
def pre_build_steps(self): def pre_build_steps(self):
return [] return []

2
tools/run_tests/sanity/check_submodules.sh
Unescape View File

@ -45,7 +45,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules
05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f) 05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f)
c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0) c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0)
f8ac463766281625ad710900479130c7fcb4d63b third_party/nanopb (nanopb-0.3.4-29-gf8ac463) f8ac463766281625ad710900479130c7fcb4d63b third_party/nanopb (nanopb-0.3.4-29-gf8ac463)
bdeb215cab2985195325fcd5e70c3fa751f46e0f third_party/protobuf (v3.0.0-beta-3.3) e8ae137c96444ea313485ed1118c5e43b2099cf1 third_party/protobuf (v3.0.0-beta-4-74-ge8ae137)
50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8) 50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8)
EOF EOF

Write Preview
Loading…
Cancel
Save