From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 3 Dec 2014 16:09:21 +0000 (+0000)
Subject: re PR libstdc++/64168 (FAIL: 30_threads/async/sync.cc execution test)
X-Git-Tag: releases/gcc-5.1.0~2640
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=103265d61168fbb5b5d2b2c75767cde5e8d44600;p=thirdparty%2Fgcc.git

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 35cfa804e958..9a519138f91f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future
index 60c2e4eb6d93..157ceb3bffbb 100644
--- 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.