re PR libstdc++/64168 (FAIL: 30_threads/async/sync.cc execution test)

	PR libstdc++/64168
	* include/std/future (_Deferred_state::_M_has_deferred): Fix return.

From-SVN: r218321

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 35cfa80..9a51913 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2014-12-03  Jonathan Wakely  <jwakely@redhat.com>
 
+       PR libstdc++/64168
+       * include/std/future (_Deferred_state::_M_has_deferred): Fix return.
+
+2014-12-03  Jonathan Wakely  <jwakely@redhat.com>
+
        * include/bits/hashtable.h: Fix whitespace and simplify function
        definitions with trailing return types.
 

diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future
index 60c2e4e..157ceb3 100644 (file)
--- a/libstdc++-v3/include/std/future
+++ b/libstdc++-v3/include/std/future
@@ -1606,7 +1606,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
       // Caller should check whether the state is ready first, because this
       // function will return true even after the deferred function has run.
-      virtual bool _M_has_deferred() const { true; }
+      virtual bool _M_has_deferred() const { return true; }
     };
 
   // Common functionality hoisted out of the _Async_state_impl template.