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/core/lib/surface/channel.cc | |
| parent | 90a00f8db60e5a0bbcdf1f0111b7f3ff60579016 (diff) | |
| parent | ac0808b107d73613191b66617a547a201871a845 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing
Diffstat (limited to 'src/core/lib/surface/channel.cc')
| -rw-r--r-- | src/core/lib/surface/channel.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index 5d36e5b313..c60fe51f3f 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -30,12 +30,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_tracer.h" #include "src/core/lib/debug/stats.h" +#include "src/core/lib/gpr/object_registry.h" +#include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/manual_constructor.h" +#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/support/manual_constructor.h" -#include "src/core/lib/support/memory.h" -#include "src/core/lib/support/object_registry.h" -#include "src/core/lib/support/string.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/channel_init.h" |