summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/acm
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/Ice/acm')
-rw-r--r--cpp/test/Ice/acm/AllTests.cpp6
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();
});