2010-05-19 Jonathan Wakely <jwakely.gcc@gmail.com>

	* testsuite/30_threads/future/members/wait.cc (wait): Rename.
	* testsuite/30_threads/shared_future/members/wait.cc (wait): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159593 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b5ca734..72b704e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-19  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       * testsuite/30_threads/future/members/wait.cc (wait): Rename.
+       * testsuite/30_threads/shared_future/members/wait.cc (wait): Likewise.
+
 2010-05-18  Eelis van der Weegen  <gcc-bugzilla@contacts.eelis.net>
 
        PR libstdc++/44190

diff --git a/libstdc++-v3/testsuite/30_threads/future/members/wait.cc b/libstdc++-v3/testsuite/30_threads/future/members/wait.cc
index 94a431f..d1b44db 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/future/members/wait.cc
+++ b/libstdc++-v3/testsuite/30_threads/future/members/wait.cc
@@ -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();

diff --git a/libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc b/libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc
index a4e325b..e690878 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc
@@ -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();