diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-04 12:53:40 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-04 12:53:40 -0700 |
| commit | 50a7a68ca2a5ade22a97502389ec1e0d4dcb0a10 (patch) | |
| tree | 072e2c0feee2c064e35c8f1d9f65dd2200ca1cfe /src/cpp/client | |
| parent | a6ab47c75b80f85327f2e37c7c6865f1812059ba (diff) | |
Progress commit on fixing up C++
Diffstat (limited to 'src/cpp/client')
| -rw-r--r-- | src/cpp/client/channel.cc | 11 | ||||
| -rw-r--r-- | src/cpp/client/channel.h | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc index 475a20d883..6e6278cb05 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel.cc @@ -41,7 +41,6 @@ #include <grpc/support/slice.h> #include "src/core/profiling/timers.h" -#include "src/cpp/proto/proto_utils.h" #include <grpc++/channel_arguments.h> #include <grpc++/client_context.h> #include <grpc++/completion_queue.h> @@ -75,14 +74,14 @@ Call Channel::CreateCall(const RpcMethod& method, ClientContext* context, return Call(c_call, this, cq); } -void Channel::PerformOpsOnCall(CallOpBuffer* buf, Call* call) { +void Channel::PerformOpsOnCall(CallOpSetInterface* ops, Call* call) { static const size_t MAX_OPS = 8; - size_t nops = MAX_OPS; - grpc_op ops[MAX_OPS]; + size_t nops = 0; + grpc_op cops[MAX_OPS]; GRPC_TIMER_BEGIN(GRPC_PTAG_CPP_PERFORM_OPS, call->call()); - buf->FillOps(ops, &nops); + ops->FillOps(cops, &nops); GPR_ASSERT(GRPC_CALL_OK == - grpc_call_start_batch(call->call(), ops, nops, buf)); + grpc_call_start_batch(call->call(), cops, nops, ops)); GRPC_TIMER_END(GRPC_PTAG_CPP_PERFORM_OPS, call->call()); } diff --git a/src/cpp/client/channel.h b/src/cpp/client/channel.h index cd239247c8..69baa419a6 100644 --- a/src/cpp/client/channel.h +++ b/src/cpp/client/channel.h @@ -44,7 +44,7 @@ struct grpc_channel; namespace grpc { class Call; -class CallOpBuffer; +class CallOpSetInterface; class ChannelArguments; class CompletionQueue; class Credentials; @@ -59,7 +59,7 @@ class Channel GRPC_FINAL : public GrpcLibrary, virtual void *RegisterMethod(const char *method) GRPC_OVERRIDE; virtual Call CreateCall(const RpcMethod& method, ClientContext* context, CompletionQueue* cq) GRPC_OVERRIDE; - virtual void PerformOpsOnCall(CallOpBuffer* ops, Call* call) GRPC_OVERRIDE; + virtual void PerformOpsOnCall(CallOpSetInterface* ops, Call* call) GRPC_OVERRIDE; private: const grpc::string target_; |