diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-11-09 09:42:19 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-11-09 09:42:19 -0800 |
| commit | 87a7e1fd114b571abc4644d6f1cddcaff3085df4 (patch) | |
| tree | 7723d0cb27fb96fc315a85a013635c824e018d59 /src/core/ext/client_channel/resolver_factory.c | |
| parent | bd1795ca8af6ea15c83ee0556b7a24add9464f00 (diff) | |
| parent | db096f3dba94e11bd8f78ed1ed7ff15ea585cd4f (diff) | |
Merge github.com:grpc/grpc into slice_with_exec_ctx
Diffstat (limited to 'src/core/ext/client_channel/resolver_factory.c')
| -rw-r--r-- | src/core/ext/client_channel/resolver_factory.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/ext/client_channel/resolver_factory.c b/src/core/ext/client_channel/resolver_factory.c index 7c3d644257..00bbb92dd0 100644 --- a/src/core/ext/client_channel/resolver_factory.c +++ b/src/core/ext/client_channel/resolver_factory.c @@ -43,9 +43,10 @@ void grpc_resolver_factory_unref(grpc_resolver_factory* factory) { /** Create a resolver instance for a name */ grpc_resolver* grpc_resolver_factory_create_resolver( - grpc_resolver_factory* factory, grpc_resolver_args* args) { + grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, + grpc_resolver_args* args) { if (factory == NULL) return NULL; - return factory->vtable->create_resolver(factory, args); + return factory->vtable->create_resolver(exec_ctx, factory, args); } char* grpc_resolver_factory_get_default_authority( |