diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-17 14:36:45 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-17 14:36:45 -0700 |
| commit | af26143b6fc76559f0907aadfc9f23c4e2e60844 (patch) | |
| tree | 2805cc3317954094eb8baf8a30898b1a93bbc00f /test/cpp/end2end/end2end_test.cc | |
| parent | 232e04b6199090b5805b3e7148fcfce3b8ef9956 (diff) | |
| parent | fea28b79fb0a211b2ea8515dab25db19099ea595 (diff) | |
Merge github.com:grpc/grpc into i-want-to-wait-free
Diffstat (limited to 'test/cpp/end2end/end2end_test.cc')
| -rw-r--r-- | test/cpp/end2end/end2end_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 207dad5282..4b27cfea21 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -35,7 +35,6 @@ #include <thread> #include "src/core/security/credentials.h" -#include "src/cpp/server/thread_pool.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/util/echo_duplicate.grpc.pb.h" @@ -46,6 +45,7 @@ #include <grpc++/client_context.h> #include <grpc++/create_channel.h> #include <grpc++/credentials.h> +#include <grpc++/fixed_size_thread_pool.h> #include <grpc++/server.h> #include <grpc++/server_builder.h> #include <grpc++/server_context.h> @@ -260,7 +260,7 @@ class End2endTest : public ::testing::Test { TestServiceImpl service_; TestServiceImpl special_service_; TestServiceImplDupPkg dup_pkg_service_; - ThreadPool thread_pool_; + FixedSizeThreadPool thread_pool_; }; static void SendRpc(grpc::cpp::test::util::TestService::Stub* stub, |