diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2018-05-22 10:12:38 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-22 10:12:38 -0700 |
| commit | ba221d0423e61451b660b3d551c25cf155709285 (patch) | |
| tree | 40e37ad629686a673e97b0dc2fd1f093595c07f4 /src/core/ext/filters/client_channel/resolver.h | |
| parent | 92ff0490edfcfdb082659fa13a10ce8857ddd48e (diff) | |
| parent | 463e4d56193bbaec3977ce38fb8f0103d006794e (diff) | |
Merge branch 'master' into prototype-cfstream
Diffstat (limited to 'src/core/ext/filters/client_channel/resolver.h')
| -rw-r--r-- | src/core/ext/filters/client_channel/resolver.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/ext/filters/client_channel/resolver.h b/src/core/ext/filters/client_channel/resolver.h index cdb5a20ea3..c7e37e4468 100644 --- a/src/core/ext/filters/client_channel/resolver.h +++ b/src/core/ext/filters/client_channel/resolver.h @@ -105,6 +105,8 @@ class Resolver : public InternallyRefCountedWithTracing<Resolver> { GRPC_ABSTRACT_BASE_CLASS protected: + GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_DELETE + /// Does NOT take ownership of the reference to \a combiner. // TODO(roth): Once we have a C++-like interface for combiners, this // API should change to take a RefCountedPtr<>, so that we always take |