diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-07 09:02:28 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-07 09:02:28 -0700 |
| commit | 15195741d7758a80bcf901e7db05b3c57654c4a3 (patch) | |
| tree | 1a7cd9f6b80235306559176a34bcf0e5c7ec4407 /src/core/ext/client_channel/resolver_factory.h | |
| parent | 2137cd8e9b84fd2f602a369ee5922a6fefce2efc (diff) | |
| parent | e5c744d9850a763639b2e7001cf2487e1c76133b (diff) | |
Merge remote-tracking branch 'upstream/master' into rename_client_config
Diffstat (limited to 'src/core/ext/client_channel/resolver_factory.h')
| -rw-r--r-- | src/core/ext/client_channel/resolver_factory.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/core/ext/client_channel/resolver_factory.h b/src/core/ext/client_channel/resolver_factory.h index 1068acfdd4..1ad018ce1f 100644 --- a/src/core/ext/client_channel/resolver_factory.h +++ b/src/core/ext/client_channel/resolver_factory.h @@ -31,8 +31,8 @@ * */ -#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_FACTORY_H -#define GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_FACTORY_H +#ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_FACTORY_H +#define GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_FACTORY_H #include "src/core/ext/client_channel/client_channel_factory.h" #include "src/core/ext/client_channel/resolver.h" @@ -47,10 +47,7 @@ struct grpc_resolver_factory { const grpc_resolver_factory_vtable *vtable; }; -typedef struct grpc_resolver_args { - grpc_uri *uri; - grpc_client_channel_factory *client_channel_factory; -} grpc_resolver_args; +typedef struct grpc_resolver_args { grpc_uri *uri; } grpc_resolver_args; struct grpc_resolver_factory_vtable { void (*ref)(grpc_resolver_factory *factory); @@ -79,4 +76,4 @@ grpc_resolver *grpc_resolver_factory_create_resolver( char *grpc_resolver_factory_get_default_authority( grpc_resolver_factory *factory, grpc_uri *uri); -#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_FACTORY_H */ +#endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_FACTORY_H */ |