diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-03-02 22:09:52 -0800 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-03-02 22:09:52 -0800 |
| commit | 94dad67f4386ca1d46d96fd255cf4a9df5c087b2 (patch) | |
| tree | 43e29b584e7d8c062d91eee5d0fc50639c1643e4 /src/core/lib/iomgr/exec_ctx.cc | |
| parent | c1284576f81efc4b2d9c33c4337d8c9fbafc29de (diff) | |
| parent | 6eae794c9f8f305a51274a79400124093ddc9354 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing
Diffstat (limited to 'src/core/lib/iomgr/exec_ctx.cc')
| -rw-r--r-- | src/core/lib/iomgr/exec_ctx.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 132fe87870..2f544b20ab 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -23,7 +23,7 @@ #include <grpc/support/log.h> #include <grpc/support/sync.h> -#include "src/core/lib/gpr/thd.h" +#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/profiling/timers.h" |