diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-08-11 17:28:42 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-08-11 17:28:42 -0700 |
| commit | 9e2b7c81b10f79085df25a27fd2ab4b37e7d00e5 (patch) | |
| tree | 6a98eedeb3353289bee6ea5b44af8cbb62e031fa /src/compiler/cpp_generator.cc | |
| parent | a16b5ef455c63a18929b4ef90945e90f01c1fd58 (diff) | |
| parent | 9a2a3aecc8f7d667df0236df0367bb59a4ae37b1 (diff) | |
Resolved merge conflicts with master
Diffstat (limited to 'src/compiler/cpp_generator.cc')
| -rw-r--r-- | src/compiler/cpp_generator.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/compiler/cpp_generator.cc b/src/compiler/cpp_generator.cc index 75659947df..ea487bcd89 100644 --- a/src/compiler/cpp_generator.cc +++ b/src/compiler/cpp_generator.cc @@ -119,6 +119,7 @@ grpc::string GetHeaderIncludes(const grpc::protobuf::FileDescriptor *file, "#include <grpc++/async_unary_call.h>\n" "#include <grpc++/status.h>\n" "#include <grpc++/stream.h>\n" + "#include <grpc++/stub_options.h>\n" "\n" "namespace grpc {\n" "class CompletionQueue;\n" @@ -574,8 +575,8 @@ void PrintHeaderService(grpc::protobuf::io::Printer *printer, printer->Print("};\n"); printer->Print( "static std::unique_ptr<Stub> NewStub(const std::shared_ptr< " - "::grpc::ChannelInterface>& " - "channel);\n"); + "::grpc::ChannelInterface>& channel, " + "const ::grpc::StubOptions& options = ::grpc::StubOptions());\n"); printer->Print("\n"); @@ -966,7 +967,8 @@ void PrintSourceService(grpc::protobuf::io::Printer *printer, printer->Print( *vars, "std::unique_ptr< $ns$$Service$::Stub> $ns$$Service$::NewStub(" - "const std::shared_ptr< ::grpc::ChannelInterface>& channel) {\n" + "const std::shared_ptr< ::grpc::ChannelInterface>& channel, " + "const ::grpc::StubOptions& options) {\n" " std::unique_ptr< $ns$$Service$::Stub> stub(new " "$ns$$Service$::Stub(channel));\n" " return stub;\n" |