Skip to content
Snippets Groups Projects
Commit 465e2e11 authored by Craig Tiller's avatar Craig Tiller
Browse files

Merge github.com:google/grpc into api

parents 3f8bd048 f1f7213a
No related branches found
No related tags found
No related merge requests found
......@@ -182,7 +182,8 @@ void PrintHeaderServerMethod(google::protobuf::io::Printer* printer,
"::grpc::ServerContext* context, const $Request$* request, "
"::grpc::ServerWriter< $Response$>* writer);\n");
} else if (BidiStreaming(method)) {
printer->Print(*vars,
printer->Print(
*vars,
"virtual ::grpc::Status $Method$("
"::grpc::ServerContext* context, "
"::grpc::ServerReaderWriter< $Response$, $Request$>* stream);"
......@@ -269,7 +270,8 @@ void PrintSourceClientMethod(google::protobuf::io::Printer* printer,
"context, request, response);\n"
"}\n\n");
} else if (ClientOnlyStreaming(method)) {
printer->Print(*vars,
printer->Print(
*vars,
"::grpc::ClientWriter< $Request$>* $Service$::Stub::$Method$("
"::grpc::ClientContext* context, $Response$* response) {\n");
printer->Print(*vars,
......@@ -361,7 +363,8 @@ void PrintSourceService(google::protobuf::io::Printer* printer,
const google::protobuf::ServiceDescriptor* service,
map<string, string>* vars) {
(*vars)["Service"] = service->name();
printer->Print(*vars,
printer->Print(
*vars,
"$Service$::Stub* $Service$::NewStub("
"const std::shared_ptr< ::grpc::ChannelInterface>& channel) {\n"
" $Service$::Stub* stub = new $Service$::Stub();\n"
......
......
......@@ -31,7 +31,6 @@
*
*/
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200112L
#endif
......
......
......@@ -39,16 +39,12 @@
#if GPR_GETPID_IN_UNISTD_H
#include <unistd.h>
static int seed() {
return getpid();
}
static int seed() { return getpid(); }
#endif
#if GPR_GETPID_IN_PROCESS_H
#include <process.h>
static int seed(void) {
return _getpid();
}
static int seed(void) { return _getpid(); }
#endif
void grpc_test_init(int argc, char **argv) {
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment