diff options
author | 2018-02-24 10:37:13 -0600 | |
---|---|---|
committer | 2018-02-24 10:37:13 -0600 | |
commit | 8b05d0284f6aaaa2a9567f992189bef91550a645 (patch) | |
tree | f81d3def61ca3345bdc133b8d12cae9af15c5300 /src/core/ext/filters/client_channel/resolver/fake | |
parent | d71b55db98fe6eec1c5207a335209da2a0c56449 (diff) | |
parent | d5b1f9809202bf2338f94a9e1c07bc511b42d67d (diff) |
Merge branch 'master' into 2phase_thd
Diffstat (limited to 'src/core/ext/filters/client_channel/resolver/fake')
-rw-r--r-- | src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc | 3 | ||||
-rw-r--r-- | src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index b01e608c3f..4d8958f519 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -17,6 +17,8 @@ // This is similar to the sockaddr resolver, except that it supports a // bunch of query args that are useful for dependency injection in tests. +#include <grpc/support/port_platform.h> + #include <limits.h> #include <stdbool.h> #include <stdio.h> @@ -24,7 +26,6 @@ #include <string.h> #include <grpc/support/alloc.h> -#include <grpc/support/port_platform.h> #include <grpc/support/string_util.h> #include "src/core/ext/filters/client_channel/lb_policy_factory.h" diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h index d42811d913..858f35851d 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h @@ -17,6 +17,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FAKE_FAKE_RESOLVER_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FAKE_FAKE_RESOLVER_H +#include <grpc/support/port_platform.h> + #include "src/core/ext/filters/client_channel/lb_policy_factory.h" #include "src/core/ext/filters/client_channel/uri_parser.h" #include "src/core/lib/channel/channel_args.h" |