git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* testsuite/performance/30_threads/future/polling.cc: Adjust. 

From-SVN: r186354
This commit is contained in:
Jonathan Wakely 2012-04-11 21:31:06 +01:00
parent 559d990c3c
commit 6cc5558fe8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,8 +1,12 @@
2012-04-11 Jonathan Wakely <jwakely.gcc@gmail.com>
* testsuite/performance/30_threads/future/polling.cc: Adjust.
2012-04-11 Paolo Carlini <paolo.carlini@oracle.com> 2012-04-11 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/forward_list.h (splice_after(const_iterator, * include/bits/forward_list.h (splice_after(const_iterator,
forward_list&), splice_after(const_iterator, forward_list&, forward_list&), splice_after(const_iterator, forward_list&,
consst_iterator), splice_after(const_iterator, forward_list&, const_iterator), splice_after(const_iterator, forward_list&,
const_iterator, const_iterator), merge(forward_list&), const_iterator, const_iterator), merge(forward_list&),
merge(forward_list&, _Comp)): Add per C++11 as published (and merge(forward_list&, _Comp)): Add per C++11 as published (and
LWG 1310). LWG 1310).

4
libstdc++-v3/testsuite/performance/30_threads/future/polling.cc
View File

@ -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 // 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 // software; you can redistribute it and/or modify it under the
@ -22,7 +22,7 @@
inline bool is_ready(std::shared_future<void>& f) 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) void poll(std::shared_future<void> f)