diff options
| author |  yang-g <yangg@google.com> | 2015-08-24 14:45:39 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-08-24 14:45:39 -0700 |
| commit | b1f24078338108a0b741a342e4916731f01b2601 (patch) | |
| tree | 80e054b92d5a2100d2af79a324b6c73a8dd765e8 /src/cpp/server/create_default_thread_pool.cc | |
| parent | d392fa04c5866387c981f4cd83392d1a2e3da7a8 (diff) | |
| parent | e29e18ccf07be20da2540b8fc862894ff933aa6c (diff) | |
merge with head and resolve conflicts
Diffstat (limited to 'src/cpp/server/create_default_thread_pool.cc')
| -rw-r--r-- | src/cpp/server/create_default_thread_pool.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/server/create_default_thread_pool.cc b/src/cpp/server/create_default_thread_pool.cc index 9f59d254f1..f4ff4154b2 100644 --- a/src/cpp/server/create_default_thread_pool.cc +++ b/src/cpp/server/create_default_thread_pool.cc @@ -32,7 +32,7 @@ */ #include <grpc/support/cpu.h> -#include <grpc++/dynamic_thread_pool.h> +#include "src/cpp/server/dynamic_thread_pool.h" #ifndef GRPC_CUSTOM_DEFAULT_THREAD_POOL |