From patchwork Mon Dec 17 21:30:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 206999 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]) by ozlabs.org (Postfix) with SMTP id 5CE882C037F for ; Tue, 18 Dec 2012 08:31:29 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1356384690; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=oCm1Rvq IZ+aGlWnBolJfTdH3tGw=; b=yj8tk8+vu0FwX9OlmyOcgtHZsLGbvn3M19IU6K8 i3nqLizCDnuh8zbPMYx2r4wss6SlUp7elDA1vJKnV49lMobJvB7042tWw5lbhH4S GVIZ0bZ14RQVg67VYxBDRH35wZIIyygknP+d/XAuGQT9Z6RvaQH0Oigy73QWBASb qnk4= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=MRHLmWANcbTk2WPZbBqnbpM+3bA2Aef0PlVTUWcdqlfUgMv2pKwZxbtL0fNECV 8HEQPW2HKKdvmYOr8Mv4gPROKGONyZLqZfk36aGNWT/lIVGHe4OeQ9EBHbi04aDc aVzMmhDAV8bIoK8TZW5DMI5dNuH8Aqx2jy4rIpAu1nYWE=; Received: (qmail 29264 invoked by alias); 17 Dec 2012 21:31:07 -0000 Received: (qmail 29043 invoked by uid 22791); 17 Dec 2012 21:30:59 -0000 X-SWARE-Spam-Status: No, hits=-4.5 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-ie0-f175.google.com (HELO mail-ie0-f175.google.com) (209.85.223.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 17 Dec 2012 21:30:54 +0000 Received: by mail-ie0-f175.google.com with SMTP id qd14so9670976ieb.20 for ; Mon, 17 Dec 2012 13:30:53 -0800 (PST) MIME-Version: 1.0 Received: by 10.43.83.1 with SMTP id ae1mr12769702icc.24.1355779851953; Mon, 17 Dec 2012 13:30:51 -0800 (PST) Received: by 10.43.5.199 with HTTP; Mon, 17 Dec 2012 13:30:51 -0800 (PST) Date: Mon, 17 Dec 2012 21:30:51 +0000 Message-ID: Subject: [v3 patch] remove __async_sfinae_helper From: Jonathan Wakely To: "libstdc++" , gcc-patches 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 With the implementation of N3436 we no longer need the __async_sfinae_helper, as result_of does the same job on its own. * include/std/future (__async_sfinae_helper): Remove. Tested x86_64-linux, committed to trunk. commit 797f96cc81e09197bc377206319667c579ecb81b Author: Jonathan Wakely Date: Mon Dec 17 21:00:57 2012 +0000 * include/std/future (__async_sfinae_helper): Remove. diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index c24ab77..2ecf438 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -170,19 +170,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION future::type> async(launch __policy, _Fn&& __fn, _Args&&... __args); - template - struct __async_sfinae_helper - { - typedef future::type> type; - }; - template - struct __async_sfinae_helper - { }; - - template - typename - __async_sfinae_helper::type, _Fn, _Args...>::type + future::type> async(_Fn&& __fn, _Args&&... __args); #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \ @@ -1509,8 +1498,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// async, potential overload template - inline typename - __async_sfinae_helper::type, _Fn, _Args...>::type + inline future::type> async(_Fn&& __fn, _Args&&... __args) { return async(launch::async|launch::deferred, std::forward<_Fn>(__fn),