From 6cc5558fe8380697c0274c905dc49637e1df0dcd Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 11 Apr 2012 21:31:06 +0100 Subject: [PATCH] * testsuite/performance/30_threads/future/polling.cc: Adjust. From-SVN: r186354 --- libstdc++-v3/ChangeLog | 6 +++++- .../testsuite/performance/30_threads/future/polling.cc | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6e47c8cc479..48366e23a3e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,8 +1,12 @@ +2012-04-11 Jonathan Wakely + + * testsuite/performance/30_threads/future/polling.cc: Adjust. + 2012-04-11 Paolo Carlini * include/bits/forward_list.h (splice_after(const_iterator, 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&), merge(forward_list&, _Comp)): Add per C++11 as published (and LWG 1310). 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& 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 f) -- 2.30.2