Skip to content

Commit 3be45a5

Browse files
authored
Merge pull request grpc#18176 from tzik/msvc_fix
Remove no-effect std::move() that causes MSVC warning
2 parents 73bca77 + e94a114 commit 3be45a5

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

src/core/ext/filters/client_channel/lb_policy.h

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,7 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
202202
/// by the client channel.
203203
virtual void UpdateState(grpc_connectivity_state state,
204204
grpc_error* state_error,
205-
UniquePtr<SubchannelPicker> picker) {
206-
std::move(picker); // Suppress clang-tidy complaint.
207-
// The rest of this is copied from the GRPC_ABSTRACT macro.
208-
gpr_log(GPR_ERROR, "Function marked GRPC_ABSTRACT was not implemented");
209-
GPR_ASSERT(false);
210-
}
205+
UniquePtr<SubchannelPicker>) GRPC_ABSTRACT;
211206

212207
/// Requests that the resolver re-resolve.
213208
virtual void RequestReresolution() GRPC_ABSTRACT;
@@ -261,10 +256,8 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
261256
/// Note that the LB policy gets the set of addresses from the
262257
/// GRPC_ARG_SERVER_ADDRESS_LIST channel arg.
263258
virtual void UpdateLocked(const grpc_channel_args& args,
264-
RefCountedPtr<Config> lb_config) {
265-
std::move(lb_config); // Suppress clang-tidy complaint.
266-
GRPC_ABSTRACT;
267-
}
259+
RefCountedPtr<Config>) // NOLINT
260+
GRPC_ABSTRACT;
268261

269262
/// Tries to enter a READY connectivity state.
270263
/// This is a no-op by default, since most LB policies never go into

src/core/ext/filters/client_channel/lb_policy_factory.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ class LoadBalancingPolicyFactory {
3131
public:
3232
/// Returns a new LB policy instance.
3333
virtual OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy(
34-
LoadBalancingPolicy::Args args) const {
35-
std::move(args); // Suppress clang-tidy complaint.
36-
GRPC_ABSTRACT;
37-
}
34+
LoadBalancingPolicy::Args) const GRPC_ABSTRACT;
3835

3936
/// Returns the LB policy name that this factory provides.
4037
/// Caller does NOT take ownership of result.

0 commit comments

Comments
 (0)