diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-08 10:21:11 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-08 10:21:11 -0800 |
| commit | 573717bc8d7aea0eedb5fa33083bcbc38f59159b (patch) | |
| tree | 92139d50dd48fea3f347cbbe3df1af1f7c9d7335 /test/core/memory_usage | |
| parent | 32748c1b2aff43af72b643219fc843f501cb626f (diff) | |
| parent | 7bd5e18fea0201fed3edd74e3c3d7caf9040609c (diff) | |
Merge branch 'master' into gpr_review3
Diffstat (limited to 'test/core/memory_usage')
| -rw-r--r-- | test/core/memory_usage/memory_usage_test.cc | 2 | ||||
| -rw-r--r-- | test/core/memory_usage/server.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc index bf248c92ba..cc3528b060 100644 --- a/test/core/memory_usage/memory_usage_test.cc +++ b/test/core/memory_usage/memory_usage_test.cc @@ -20,9 +20,9 @@ #include <string.h> #include <grpc/support/alloc.h> -#include <grpc/support/host_port.h> #include <grpc/support/string_util.h> +#include "src/core/lib/gpr/host_port.h" #include "src/core/lib/gpr/string.h" #include "test/core/util/port.h" #include "test/core/util/subprocess.h" diff --git a/test/core/memory_usage/server.cc b/test/core/memory_usage/server.cc index 7ee591dfac..a276102e83 100644 --- a/test/core/memory_usage/server.cc +++ b/test/core/memory_usage/server.cc @@ -30,9 +30,10 @@ #endif #include <grpc/support/alloc.h> -#include <grpc/support/host_port.h> #include <grpc/support/log.h> #include <grpc/support/time.h> + +#include "src/core/lib/gpr/host_port.h" #include "test/core/end2end/data/ssl_test_data.h" #include "test/core/util/cmdline.h" #include "test/core/util/memory_counters.h" |