diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-26 12:55:47 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-26 12:55:47 -0700 |
| commit | d9aed1d0103122c235c5577f7a00ead9cbc1a7b9 (patch) | |
| tree | c28b50ccab7a19287984857daf40d552e50247ab /src/cpp/server/create_default_thread_pool.cc | |
| parent | 7cb085375581ff2b18865e4e72b335276d08d09d (diff) | |
| parent | 5c575dd6e4b01cd68cca5d1917b58023dcf4ca0f (diff) | |
Merge github.com:grpc/grpc into elliptic-orange-chamelion
Conflicts:
src/csharp/ext/grpc_csharp_ext.c
Diffstat (limited to 'src/cpp/server/create_default_thread_pool.cc')
| -rw-r--r-- | src/cpp/server/create_default_thread_pool.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpp/server/create_default_thread_pool.cc b/src/cpp/server/create_default_thread_pool.cc index cc182f59f4..81c84474d8 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++/fixed_size_thread_pool.h> +#include <grpc++/dynamic_thread_pool.h> #ifndef GRPC_CUSTOM_DEFAULT_THREAD_POOL @@ -41,7 +41,7 @@ namespace grpc { ThreadPoolInterface* CreateDefaultThreadPool() { int cores = gpr_cpu_num_cores(); if (!cores) cores = 4; - return new FixedSizeThreadPool(cores); + return new DynamicThreadPool(cores); } } // namespace grpc |