diff options
| author |  Mark D. Roth <roth@google.com> | 2016-11-03 09:23:47 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-11-03 09:23:47 -0700 |
| commit | d3f25b3dfe25b7b4a39d6f148b616e9be6ba1347 (patch) | |
| tree | 46adee9ad3c163e4aaedde22b6b82d3210de6e4a /test/cpp/interop/stress_test.cc | |
| parent | 6c8492de8a27b3b6afa3533543eeac167b5c94cc (diff) | |
| parent | b37ace5d279925ecd7f8dd6dca03e20cb066ae50 (diff) | |
Merge remote-tracking branch 'upstream/master' into remove_fake_resolver
Diffstat (limited to 'test/cpp/interop/stress_test.cc')
| -rw-r--r-- | test/cpp/interop/stress_test.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc index 46d09b7f28..fc35db5233 100644 --- a/test/cpp/interop/stress_test.cc +++ b/test/cpp/interop/stress_test.cc @@ -40,7 +40,6 @@ #include <gflags/gflags.h> #include <grpc++/create_channel.h> #include <grpc++/grpc++.h> -#include <grpc++/impl/thd.h> #include <grpc/support/log.h> #include <grpc/support/time.h> @@ -321,7 +320,7 @@ int main(int argc, char** argv) { gpr_log(GPR_INFO, "Starting test(s).."); - std::vector<grpc::thread> test_threads; + std::vector<std::thread> test_threads; // Create and start the test threads. // Note that: @@ -361,7 +360,7 @@ int main(int argc, char** argv) { "/stress_test/server_%d/channel_%d/stub_%d/qps", server_idx, channel_idx, stub_idx); - test_threads.emplace_back(grpc::thread( + test_threads.emplace_back(std::thread( &StressTestInteropClient::MainLoop, client, metrics_service.CreateQpsGauge(buffer, &is_already_created))); |