diff options
| author | Jose <jose@zeroc.com> | 2019-07-18 23:51:08 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-18 23:51:08 +0200 |
| commit | fc886b010c01cccb8cca3ac4d92f1ebd7fc72295 (patch) | |
| tree | 51cf00a4a955efecc9c94527aeafcb25ffbe57b9 /cpp/test/Ice/acm/AllTests.cpp | |
| parent | Simplify OutputStream creation (diff) | |
| parent | Fixed non-thread safe AMD dispatch, fixes #448 (#449) (diff) | |
| download | ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.bz2 ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.xz ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/test/Ice/acm/AllTests.cpp')
| -rw-r--r-- | cpp/test/Ice/acm/AllTests.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/test/Ice/acm/AllTests.cpp b/cpp/test/Ice/acm/AllTests.cpp index f9ca74170f4..d9e81d9370d 100644 --- a/cpp/test/Ice/acm/AllTests.cpp +++ b/cpp/test/Ice/acm/AllTests.cpp @@ -166,7 +166,7 @@ public: } #ifdef ICE_CPP11_MAPPING - void join(thread& t) + void join(std::thread& t) #else void join() #endif @@ -735,11 +735,11 @@ allTests(Test::TestHelper* helper) } #ifdef ICE_CPP11_MAPPING - vector<pair<thread, TestCasePtr>> threads; + vector<pair<std::thread, TestCasePtr>> threads; for(auto p = tests.begin(); p != tests.end(); ++p) { TestCasePtr testCase = *p; - thread t([testCase]() + std::thread t([testCase]() { testCase->run(); }); |