Fix clang errors.

pull/19261/head
Karthik Ravi Shankar 6 years ago
parent 522ddfe273
commit 7e18e6cf3f
  1. 5
      include/grpcpp/channel_impl.h
  2. 2
      include/grpcpp/impl/codegen/channel_interface.h
  3. 2
      include/grpcpp/impl/codegen/client_callback.h
  4. 5
      include/grpcpp/impl/codegen/client_context_impl.h
  5. 7
      include/grpcpp/impl/codegen/client_interceptor.h
  6. 8
      include/grpcpp/impl/codegen/client_unary_call.h

@ -100,8 +100,9 @@ class Channel final : public ::grpc::ChannelInterface,
::grpc::CompletionQueue* CallbackCQ() override;
::grpc::internal::Call CreateCallInternal(
const ::grpc::internal::RpcMethod& method, ::grpc_impl::ClientContext* context,
::grpc::CompletionQueue* cq, size_t interceptor_pos) override;
const ::grpc::internal::RpcMethod& method,
::grpc_impl::ClientContext* context, ::grpc::CompletionQueue* cq,
size_t interceptor_pos) override;
const grpc::string host_;
grpc_channel* const c_channel_; // owned

@ -27,7 +27,7 @@
namespace grpc_impl {
class ClientContext;
class CompletionQueue;
}
} // namespace grpc_impl
namespace grpc {
class ChannelInterface;

@ -32,7 +32,7 @@
namespace grpc_impl {
class Channel;
class ClientContext;
}
} // namespace grpc_impl
namespace grpc {

@ -435,9 +435,8 @@ class ClientContext {
grpc::experimental::ClientRpcInfo* set_client_rpc_info(
const char* method, grpc::internal::RpcMethod::RpcType type,
grpc::ChannelInterface* channel,
const std::vector<
std::unique_ptr<grpc::experimental::ClientInterceptorFactoryInterface>>&
creators,
const std::vector<std::unique_ptr<
grpc::experimental::ClientInterceptorFactoryInterface>>& creators,
size_t interceptor_pos) {
rpc_info_ = grpc::experimental::ClientRpcInfo(this, type, method, channel);
rpc_info_.RegisterInterceptors(creators, interceptor_pos);

@ -30,7 +30,7 @@ namespace grpc_impl {
class Channel;
class ClientContext;
}
} // namespace grpc_impl
namespace grpc {
@ -118,8 +118,9 @@ class ClientRpcInfo {
ClientRpcInfo() = default;
// Constructor will only be called from ClientContext
ClientRpcInfo(grpc_impl::ClientContext* ctx, internal::RpcMethod::RpcType type,
const char* method, grpc::ChannelInterface* channel)
ClientRpcInfo(grpc_impl::ClientContext* ctx,
internal::RpcMethod::RpcType type, const char* method,
grpc::ChannelInterface* channel)
: ctx_(ctx),
type_(static_cast<Type>(type)),
method_(method),

@ -36,8 +36,8 @@ class RpcMethod;
/// Wrapper that performs a blocking unary call
template <class InputMessage, class OutputMessage>
Status BlockingUnaryCall(ChannelInterface* channel, const RpcMethod& method,
grpc_impl::ClientContext* context, const InputMessage& request,
OutputMessage* result) {
grpc_impl::ClientContext* context,
const InputMessage& request, OutputMessage* result) {
return BlockingUnaryCallImpl<InputMessage, OutputMessage>(
channel, method, context, request, result)
.status();
@ -47,8 +47,8 @@ template <class InputMessage, class OutputMessage>
class BlockingUnaryCallImpl {
public:
BlockingUnaryCallImpl(ChannelInterface* channel, const RpcMethod& method,
grpc_impl::ClientContext* context, const InputMessage& request,
OutputMessage* result) {
grpc_impl::ClientContext* context,
const InputMessage& request, OutputMessage* result) {
CompletionQueue cq(grpc_completion_queue_attributes{
GRPC_CQ_CURRENT_VERSION, GRPC_CQ_PLUCK, GRPC_CQ_DEFAULT_POLLING,
nullptr}); // Pluckable completion queue

Loading…
Cancel
Save