diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-03-02 08:51:52 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-03-02 08:51:52 -0800 |
| commit | 61691f92c37f48cb194754aafefbf1e6462fa3c7 (patch) | |
| tree | f7dae4d713a35f0fdac70c66f98599c41336e2eb /src/cpp/client | |
| parent | 29f131428272e3b0f5c13d9ec6417f9e3b6dbc9b (diff) | |
| parent | 7a89026886e9da28194ecdff840040980634ef99 (diff) | |
Merge github.com:grpc/grpc into credit
Diffstat (limited to 'src/cpp/client')
| -rw-r--r-- | src/cpp/client/channel.h | 14 | ||||
| -rw-r--r-- | src/cpp/client/client_context.cc | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/cpp/client/channel.h b/src/cpp/client/channel.h index f5c9e0f616..a1de3817e6 100644 --- a/src/cpp/client/channel.h +++ b/src/cpp/client/channel.h @@ -31,8 +31,8 @@ * */ -#ifndef __GRPCPP_INTERNAL_CLIENT_CHANNEL_H__ -#define __GRPCPP_INTERNAL_CLIENT_CHANNEL_H__ +#ifndef GRPC_INTERNAL_CPP_CLIENT_CHANNEL_H +#define GRPC_INTERNAL_CPP_CLIENT_CHANNEL_H #include <memory> @@ -49,14 +49,14 @@ class CompletionQueue; class Credentials; class StreamContextInterface; -class Channel final : public ChannelInterface { +class Channel GRPC_FINAL : public ChannelInterface { public: Channel(const grpc::string &target, grpc_channel *c_channel); - ~Channel() override; + ~Channel() GRPC_OVERRIDE; virtual Call CreateCall(const RpcMethod &method, ClientContext *context, - CompletionQueue *cq) override; - virtual void PerformOpsOnCall(CallOpBuffer *ops, Call *call) override; + CompletionQueue *cq) GRPC_OVERRIDE; + virtual void PerformOpsOnCall(CallOpBuffer *ops, Call *call) GRPC_OVERRIDE; private: const grpc::string target_; @@ -65,4 +65,4 @@ class Channel final : public ChannelInterface { } // namespace grpc -#endif // __GRPCPP_INTERNAL_CLIENT_CHANNEL_H__ +#endif // GRPC_INTERNAL_CPP_CLIENT_CHANNEL_H diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index 80cbdd93ac..9f99f7bcd5 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -41,7 +41,10 @@ using std::chrono::system_clock; namespace grpc { ClientContext::ClientContext() - : call_(nullptr), cq_(nullptr), absolute_deadline_(gpr_inf_future) {} + : initial_metadata_received_(false), + call_(nullptr), + cq_(nullptr), + absolute_deadline_(gpr_inf_future) {} ClientContext::~ClientContext() { if (call_) { |