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/slice | |
| parent | 032e9b32dc5978a042bdda5c3031ae6cbd928973 (diff) | |
| parent | 9813858908da2e7deaa58d91f4030e6881e364e3 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface
Diffstat (limited to 'src/core/lib/slice')
| -rw-r--r-- | src/core/lib/slice/slice_intern.cc | 2 | ||||
| -rw-r--r-- | src/core/lib/slice/slice_string_helpers.cc | 2 | ||||
| -rw-r--r-- | src/core/lib/slice/slice_string_helpers.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/lib/slice/slice_intern.cc b/src/core/lib/slice/slice_intern.cc index c578c6d9de..fe1770b92c 100644 --- a/src/core/lib/slice/slice_intern.cc +++ b/src/core/lib/slice/slice_intern.cc @@ -24,10 +24,10 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> +#include "src/core/lib/gpr/murmur_hash.h" #include "src/core/lib/iomgr/iomgr_internal.h" /* for iomgr_abort_on_leaks() */ #include "src/core/lib/profiling/timers.h" #include "src/core/lib/slice/slice_string_helpers.h" -#include "src/core/lib/support/murmur_hash.h" #include "src/core/lib/transport/static_metadata.h" #define LOG2_SHARD_COUNT 5 diff --git a/src/core/lib/slice/slice_string_helpers.cc b/src/core/lib/slice/slice_string_helpers.cc index f134f31dee..4441a26d8e 100644 --- a/src/core/lib/slice/slice_string_helpers.cc +++ b/src/core/lib/slice/slice_string_helpers.cc @@ -22,8 +22,8 @@ #include <grpc/support/log.h> +#include "src/core/lib/gpr/string.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/support/string.h" char* grpc_dump_slice(grpc_slice s, uint32_t flags) { return gpr_dump((const char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s), diff --git a/src/core/lib/slice/slice_string_helpers.h b/src/core/lib/slice/slice_string_helpers.h index 73fc0eeb1c..429f9ff4b5 100644 --- a/src/core/lib/slice/slice_string_helpers.h +++ b/src/core/lib/slice/slice_string_helpers.h @@ -26,7 +26,7 @@ #include <grpc/slice_buffer.h> #include <grpc/support/port_platform.h> -#include "src/core/lib/support/string.h" +#include "src/core/lib/gpr/string.h" /* Calls gpr_dump on a slice. */ char* grpc_dump_slice(grpc_slice slice, uint32_t flags); |