From patchwork Wed Dec 3 16:10:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 417488 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0E4191400E2 for ; Thu, 4 Dec 2014 03:11:18 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=kMjrvuVA5Fnb3wpSpzUQVUayt0e6p1yVZZUdgYZyYb4hgLJeAl85t y7zdU5Lty1n6vwKMzg72iEKkA/WPvPCUGMZMcP5WSGE9DKFMow1QYnBixsyq+TEI G+Go1+zhg+GQApL0+76SLyZ7yUfKPMjxVea+zWnUnHqDHv0L6SRgVA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=SbHmfimLgd0V02ZRSa27jkXG6Ac=; b=XnytaNj34LLe6tQaJ88p L/r/i4x9rivD/MRW/kh7fYeUfY14dSAMF7s4+SwXjFEyOgicIfO2U/9eYw6OEgfR 933HYKPMnvrypiAlYSK7ljO49uIJLFgdbSoAiSKBz/8TYXIAdvxr0QvXNp9KkcIe UBR+/cbMihKK92PmO06Jj5s= Received: (qmail 2979 invoked by alias); 3 Dec 2014 16:10:28 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 2940 invoked by uid 89); 3 Dec 2014 16:10:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 03 Dec 2014 16:10:23 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sB3GAKb5031005 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 3 Dec 2014 11:10:21 -0500 Received: from localhost (ovpn-116-46.ams2.redhat.com [10.36.116.46]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sB3GAJeI028379; Wed, 3 Dec 2014 11:10:20 -0500 Date: Wed, 3 Dec 2014 16:10:19 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [patch] libstdc++/64168 fix return statement Message-ID: <20141203161019.GQ3134@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) I've really got to start testing with -Wsystem-headers so I don't do silly things like this. Committed as obvious. commit 88abdc37b00dbe64099f78a31163a299a023ec03 Author: Jonathan Wakely Date: Wed Dec 3 16:08:08 2014 +0000 PR libstdc++/64168 * include/std/future (_Deferred_state::_M_has_deferred): Fix return. diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 60c2e4e..157ceb3 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.