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

From-SVN: r186354

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6e47c8c..48366e2 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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>
 
        * 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 83fde27..26cf632 100644 (file)
--- 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)