[v3] rename function to avoid clashing with system call
Jonathan Wakely
jwakely.gcc@gmail.com
Wed May 19 18:51:00 GMT 2010
* testsuite/30_threads/future/members/wait.cc (wait): Rename.
* testsuite/30_threads/shared_future/members/wait.cc (wait): Likewise.
Tested x86_64/Linux, committed to trunk
-------------- next part --------------
Index: testsuite/30_threads/future/members/wait.cc
===================================================================
--- testsuite/30_threads/future/members/wait.cc (revision 159592)
+++ testsuite/30_threads/future/members/wait.cc (working copy)
@@ -31,7 +31,7 @@
#include <testsuite_hooks.h>
-void wait(std::future<void>& f)
+void fut_wait(std::future<void>& f)
{
f.wait();
}
@@ -41,7 +41,7 @@ void test01()
std::promise<void> p1;
std::future<void> f1(p1.get_future());
- std::thread t1(wait, std::ref(f1));
+ std::thread t1(fut_wait, std::ref(f1));
p1.set_value();
t1.join();
Index: testsuite/30_threads/shared_future/members/wait.cc
===================================================================
--- testsuite/30_threads/shared_future/members/wait.cc (revision 159592)
+++ testsuite/30_threads/shared_future/members/wait.cc (working copy)
@@ -29,7 +29,7 @@
#include <mutex>
#include <testsuite_hooks.h>
-void wait(std::shared_future<void> f)
+void fut_wait(std::shared_future<void> f)
{
f.wait();
}
@@ -39,9 +39,9 @@ void test01()
std::promise<void> p1;
std::shared_future<void> f1(p1.get_future());
- std::thread t1(wait, f1);
- std::thread t2(wait, f1);
- std::thread t3(wait, f1);
+ std::thread t1(fut_wait, f1);
+ std::thread t2(fut_wait, f1);
+ std::thread t3(fut_wait, f1);
p1.set_value();
t1.join();
More information about the Gcc-patches
mailing list