diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-01-23 08:58:11 -0800 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-01-23 08:58:11 -0800 |
| commit | bd0c019c39afde113f5f66b27b1e6055f2635725 (patch) | |
| tree | 5dfa40a2e3158b5651bf42134077d52b6fb7fea2 /src/cpp/client/channel_cc.cc | |
| parent | 90a00f8db60e5a0bbcdf1f0111b7f3ff60579016 (diff) | |
| parent | ac0808b107d73613191b66617a547a201871a845 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing
Diffstat (limited to 'src/cpp/client/channel_cc.cc')
| -rw-r--r-- | src/cpp/client/channel_cc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpp/client/channel_cc.cc b/src/cpp/client/channel_cc.cc index 08420817c8..362dff642c 100644 --- a/src/cpp/client/channel_cc.cc +++ b/src/cpp/client/channel_cc.cc @@ -42,9 +42,9 @@ #include <grpc/support/thd.h> #include <grpc/support/time.h> #include <grpc/support/useful.h> +#include "src/core/lib/gpr/env.h" +#include "src/core/lib/gpr/string.h" #include "src/core/lib/profiling/timers.h" -#include "src/core/lib/support/env.h" -#include "src/core/lib/support/string.h" namespace grpc { |