diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-08-26 10:58:17 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-08-26 10:58:17 -0700 |
| commit | c84d4aa6d08770335e1a5debbd2f3daff3897d19 (patch) | |
| tree | 85522ef3c538391da9fc8e40c0b929f00f150c80 /src/cpp/server/create_default_thread_pool.cc | |
| parent | 1dc323b45e1a109c860806cb25e7eca21c29a3c0 (diff) | |
| parent | 60e0e743bed05b248c485949c6cd9e05fa02b607 (diff) | |
Merge github.com:grpc/grpc into endpoints
Conflicts:
src/core/iomgr/tcp_windows.c
Diffstat (limited to 'src/cpp/server/create_default_thread_pool.cc')
| -rw-r--r-- | src/cpp/server/create_default_thread_pool.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cpp/server/create_default_thread_pool.cc b/src/cpp/server/create_default_thread_pool.cc index f4ff4154b2..f3b07ec8ce 100644 --- a/src/cpp/server/create_default_thread_pool.cc +++ b/src/cpp/server/create_default_thread_pool.cc @@ -32,6 +32,7 @@ */ #include <grpc/support/cpu.h> + #include "src/cpp/server/dynamic_thread_pool.h" #ifndef GRPC_CUSTOM_DEFAULT_THREAD_POOL |