diff options
author | Sree Kuchibhotla <sreecha@users.noreply.github.com> | 2015-11-17 11:31:35 -0800 |
---|---|---|
committer | Sree Kuchibhotla <sreecha@users.noreply.github.com> | 2015-11-17 11:31:35 -0800 |
commit | 3cabe69f024a33fb7c75b2a6444ffe8c7c7b584f (patch) | |
tree | 0bf15e5e7c08054d6d605663405cfb149ccfc853 /test/cpp | |
parent | 6b116ac825c88fe14fadab06beef8e253a1b45df (diff) | |
parent | 5dc96fb5b839ddb8fdb225cc5aca3ad66a85d0c9 (diff) |
Merge pull request #4138 from dgquintas/std_thread
Fix naming issue in stress_test
Diffstat (limited to 'test/cpp')
-rw-r--r-- | test/cpp/interop/stress_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc index 5d1419728e..018f4ab4f7 100644 --- a/test/cpp/interop/stress_test.cc +++ b/test/cpp/interop/stress_test.cc @@ -41,6 +41,7 @@ #include <grpc/support/time.h> #include <grpc++/create_channel.h> #include <grpc++/grpc++.h> +#include <grpc++/impl/thd.h> #include "test/cpp/interop/interop_client.h" #include "test/cpp/interop/stress_interop_client.h" @@ -80,7 +81,6 @@ DEFINE_string(test_cases, "", using std::make_pair; using std::pair; -using std::thread; using std::vector; using grpc::testing::kTestCaseList; @@ -202,7 +202,7 @@ int main(int argc, char** argv) { gpr_log(GPR_INFO, "Starting test(s).."); - vector<thread> test_threads; + vector<grpc::thread> test_threads; int thread_idx = 0; for (auto it = server_addresses.begin(); it != server_addresses.end(); it++) { StressTestInteropClient* client = new StressTestInteropClient( @@ -210,7 +210,7 @@ int main(int argc, char** argv) { FLAGS_sleep_duration_ms); test_threads.emplace_back( - thread(&StressTestInteropClient::MainLoop, client)); + grpc::thread(&StressTestInteropClient::MainLoop, client)); } for (auto it = test_threads.begin(); it != test_threads.end(); it++) { |