diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-02-26 14:05:56 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-02-26 14:27:05 -0800 |
| commit | cf133f41f84c6c8d306293a5dc8f81fbd9aed1a1 (patch) | |
| tree | ce405139ab89b1f4eedf5e8ad41abb015e503e4d /src/cpp/client | |
| parent | a1d7f7f70bd4bbc6976150672220a6fd25e209ca (diff) | |
Make it possible to compile with gcc4.6
Diffstat (limited to 'src/cpp/client')
| -rw-r--r-- | src/cpp/client/channel.h | 8 | ||||
| -rw-r--r-- | src/cpp/client/client_context.cc | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/cpp/client/channel.h b/src/cpp/client/channel.h index 06f5a8ffdf..e3edcf73a5 100644 --- a/src/cpp/client/channel.h +++ b/src/cpp/client/channel.h @@ -49,17 +49,17 @@ class CompletionQueue; class Credentials; class StreamContextInterface; -class Channel final : public ChannelInterface { +class Channel GRPC_FINAL : public ChannelInterface { public: Channel(const grpc::string &target, const ChannelArguments &args); Channel(const grpc::string &target, const std::unique_ptr<Credentials> &creds, const ChannelArguments &args); - ~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_; 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_) { |