diff options
| author |  yang-g <yangg@google.com> | 2015-08-24 16:08:36 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-08-24 16:08:36 -0700 |
| commit | 9d1f0c4a0c31e18e21770cfaf5a29ed1db94da89 (patch) | |
| tree | 9b27baca2b5df75ba78a04b394d14817fca4f68e /src | |
| parent | 3db9d017292fd8bb6be99267b82b534a42aaa1c6 (diff) | |
Fix merge failures
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpp/server/dynamic_thread_pool.h | 9 | ||||
| -rw-r--r-- | src/cpp/server/fixed_size_thread_pool.h | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/cpp/server/dynamic_thread_pool.h b/src/cpp/server/dynamic_thread_pool.h index a4683eefc4..5ba7533c05 100644 --- a/src/cpp/server/dynamic_thread_pool.h +++ b/src/cpp/server/dynamic_thread_pool.h @@ -34,15 +34,14 @@ #ifndef GRPC_INTERNAL_CPP_DYNAMIC_THREAD_POOL_H #define GRPC_INTERNAL_CPP_DYNAMIC_THREAD_POOL_H -#include <grpc++/config.h> - -#include <grpc++/impl/sync.h> -#include <grpc++/impl/thd.h> - #include <list> #include <memory> #include <queue> +#include <grpc++/impl/sync.h> +#include <grpc++/impl/thd.h> +#include <grpc++/support/config.h> + #include "src/cpp/server/thread_pool_interface.h" namespace grpc { diff --git a/src/cpp/server/fixed_size_thread_pool.h b/src/cpp/server/fixed_size_thread_pool.h index 65d3134ec4..394ae5821e 100644 --- a/src/cpp/server/fixed_size_thread_pool.h +++ b/src/cpp/server/fixed_size_thread_pool.h @@ -34,13 +34,12 @@ #ifndef GRPC_INTERNAL_CPP_FIXED_SIZE_THREAD_POOL_H #define GRPC_INTERNAL_CPP_FIXED_SIZE_THREAD_POOL_H -#include <grpc++/config.h> +#include <queue> +#include <vector> #include <grpc++/impl/sync.h> #include <grpc++/impl/thd.h> - -#include <queue> -#include <vector> +#include <grpc++/support/config.h> #include "src/cpp/server/thread_pool_interface.h" |