diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-04-11 21:47:44 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-04-11 21:47:44 +0000 |
| commit | 7ab9e319389a77a593d1355cffc66feb0c5cff61 (patch) | |
| tree | 467393d70b28a13711bcef126b14996392ea6eb8 /libstdc++-v3 | |
| parent | b91080a5e7f315bc1a148558103e7ba5eb74ddf7 (diff) | |
* testsuite/performance/30_threads/future/polling.cc: Adjust.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@186360 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/performance/30_threads/future/polling.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8e9dcd23106..cd24fb1a5b2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2012-04-11 Jonathan Wakely <jwakely.gcc@gmail.com> + * testsuite/performance/30_threads/future/polling.cc: Adjust. + +2012-04-11 Jonathan Wakely <jwakely.gcc@gmail.com> + PR libstdc++/52591 * include/bits/stl_vector.h (vector::operator=(vector&&)): Dispatch to _M_move_assign depending on whether allocator is moved. diff --git a/libstdc++-v3/testsuite/performance/30_threads/future/polling.cc b/libstdc++-v3/testsuite/performance/30_threads/future/polling.cc index 83fde27100f..26cf632e429 100644 --- a/libstdc++-v3/testsuite/performance/30_threads/future/polling.cc +++ b/libstdc++-v3/testsuite/performance/30_threads/future/polling.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -22,7 +22,7 @@ inline bool is_ready(std::shared_future<void>& f) { - return f.wait_for(std::chrono::microseconds(1)); + return f.wait_for(std::chrono::microseconds(1)) == std::future_status::ready; } void poll(std::shared_future<void> f) |