diff options
| author |  Muxi Yan <mxyan@google.com> | 2018-01-19 12:20:15 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2018-01-19 12:20:15 -0800 |
| commit | fb061c329ac5086b62619b118191574f3fd27a79 (patch) | |
| tree | 6a855770d7218425a2cd53bc378800c30d6c8525 /src/core/lib/transport/metadata.cc | |
| parent | 032e9b32dc5978a042bdda5c3031ae6cbd928973 (diff) | |
| parent | 9813858908da2e7deaa58d91f4030e6881e364e3 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface
Diffstat (limited to 'src/core/lib/transport/metadata.cc')
| -rw-r--r-- | src/core/lib/transport/metadata.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/transport/metadata.cc b/src/core/lib/transport/metadata.cc index 5f0673e014..652222bd0b 100644 --- a/src/core/lib/transport/metadata.cc +++ b/src/core/lib/transport/metadata.cc @@ -31,12 +31,12 @@ #include <grpc/support/string_util.h> #include <grpc/support/time.h> +#include "src/core/lib/gpr/murmur_hash.h" +#include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/profiling/timers.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" -#include "src/core/lib/support/murmur_hash.h" -#include "src/core/lib/support/string.h" #include "src/core/lib/transport/static_metadata.h" /* There are two kinds of mdelem and mdstr instances. |