diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-01-19 08:17:29 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-01-19 08:17:29 +0100 |
| commit | 461cf30159c0ada954e8e2a4e6591694f617809c (patch) | |
| tree | 6c0f2b9cfe328d0ed724700449f39e709915b3bd /src/core/lib/transport/service_config.cc | |
| parent | 471a5dc18b4465b051cddf4e02dbdf44336f80ce (diff) | |
| parent | bb2f7e28edc3e3dd663ad308aed7ed632a0a17bf (diff) | |
Merge branch 'master' into cmake-export-fix
Diffstat (limited to 'src/core/lib/transport/service_config.cc')
| -rw-r--r-- | src/core/lib/transport/service_config.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/transport/service_config.cc b/src/core/lib/transport/service_config.cc index cbafc33840..5c9930a273 100644 --- a/src/core/lib/transport/service_config.cc +++ b/src/core/lib/transport/service_config.cc @@ -23,11 +23,11 @@ #include <grpc/support/log.h> #include <grpc/support/string_util.h> +#include "src/core/lib/gpr/string.h" #include "src/core/lib/json/json.h" #include "src/core/lib/slice/slice_hash_table.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" -#include "src/core/lib/support/string.h" // The main purpose of the code here is to parse the service config in // JSON form, which will look like this: |