diff options
| author |  Yang Gao <yangg@google.com> | 2015-03-03 09:48:06 -0800 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-03-03 09:48:06 -0800 |
| commit | 7694c35d5f9c85ea844755d35f7d78d76e38348c (patch) | |
| tree | e34309aa27b3519ed4885454751c1a1e50735a52 /src/cpp/server/server.cc | |
| parent | 4e233a1a4653699bda751ef38923c7d755093d2c (diff) | |
Global replace google::protobuf::Message with grpc::protobuf::Message, all tests passed
Diffstat (limited to 'src/cpp/server/server.cc')
| -rw-r--r-- | src/cpp/server/server.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc index 97bf0f1a6e..17b97f6ecf 100644 --- a/src/cpp/server/server.cc +++ b/src/cpp/server/server.cc @@ -117,8 +117,8 @@ class Server::SyncRequest GRPC_FINAL : public CompletionQueueTag { } void Run() { - std::unique_ptr<google::protobuf::Message> req; - std::unique_ptr<google::protobuf::Message> res; + std::unique_ptr<grpc::protobuf::Message> req; + std::unique_ptr<grpc::protobuf::Message> res; if (has_request_payload_) { req.reset(method_->AllocateRequestProto()); if (!DeserializeProto(request_payload_, req.get())) { @@ -298,7 +298,7 @@ void Server::PerformOpsOnCall(CallOpBuffer* buf, Call* call) { class Server::AsyncRequest GRPC_FINAL : public CompletionQueueTag { public: AsyncRequest(Server* server, void* registered_method, ServerContext* ctx, - ::google::protobuf::Message* request, + grpc::protobuf::Message* request, ServerAsyncStreamingInterface* stream, CompletionQueue* cq, void* tag) : tag_(tag), @@ -352,7 +352,7 @@ class Server::AsyncRequest GRPC_FINAL : public CompletionQueueTag { private: void* const tag_; - ::google::protobuf::Message* const request_; + grpc::protobuf::Message* const request_; ServerAsyncStreamingInterface* const stream_; CompletionQueue* const cq_; ServerContext* const ctx_; @@ -364,7 +364,7 @@ class Server::AsyncRequest GRPC_FINAL : public CompletionQueueTag { }; void Server::RequestAsyncCall(void* registered_method, ServerContext* context, - ::google::protobuf::Message* request, + grpc::protobuf::Message* request, ServerAsyncStreamingInterface* stream, CompletionQueue* cq, void* tag) { new AsyncRequest(this, registered_method, context, request, stream, cq, tag); |