Merge pull request #18176 from tzik/msvc_fix

Remove no-effect std::move() that causes MSVC warning
pull/18193/head
Mark D. Roth 6 years ago committed by GitHub
commit 3be45a5682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      src/core/ext/filters/client_channel/lb_policy.h
  2. 5
      src/core/ext/filters/client_channel/lb_policy_factory.h

@ -202,12 +202,7 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
/// by the client channel.
virtual void UpdateState(grpc_connectivity_state state,
grpc_error* state_error,
UniquePtr<SubchannelPicker> picker) {
std::move(picker); // Suppress clang-tidy complaint.
// The rest of this is copied from the GRPC_ABSTRACT macro.
gpr_log(GPR_ERROR, "Function marked GRPC_ABSTRACT was not implemented");
GPR_ASSERT(false);
}
UniquePtr<SubchannelPicker>) GRPC_ABSTRACT;
/// Requests that the resolver re-resolve.
virtual void RequestReresolution() GRPC_ABSTRACT;
@ -261,10 +256,8 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
/// Note that the LB policy gets the set of addresses from the
/// GRPC_ARG_SERVER_ADDRESS_LIST channel arg.
virtual void UpdateLocked(const grpc_channel_args& args,
RefCountedPtr<Config> lb_config) {
std::move(lb_config); // Suppress clang-tidy complaint.
GRPC_ABSTRACT;
}
RefCountedPtr<Config>) // NOLINT
GRPC_ABSTRACT;
/// Tries to enter a READY connectivity state.
/// This is a no-op by default, since most LB policies never go into

@ -31,10 +31,7 @@ class LoadBalancingPolicyFactory {
public:
/// Returns a new LB policy instance.
virtual OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy(
LoadBalancingPolicy::Args args) const {
std::move(args); // Suppress clang-tidy complaint.
GRPC_ABSTRACT;
}
LoadBalancingPolicy::Args) const GRPC_ABSTRACT;
/// Returns the LB policy name that this factory provides.
/// Caller does NOT take ownership of result.

Loading…
Cancel
Save