From patchwork Wed Dec 7 15:28:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 87127 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp377495qgi; Wed, 7 Dec 2016 07:36:52 -0800 (PST) X-Received: by 10.99.174.75 with SMTP id e11mr121820711pgp.89.1481125012675; Wed, 07 Dec 2016 07:36:52 -0800 (PST) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id d21si24511344pgh.276.2016.12.07.07.36.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Dec 2016 07:36:52 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-443701-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-443701-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-443701-patch=linaro.org@gcc.gnu.org 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:references:mime-version:content-type :in-reply-to; q=dns; s=default; b=jaQj0x1REogcR+zWkc+N/fpC4tF3vp aHAc4fx/W62GyX9HIQ+O1aJP0s+ZW6+rU14Uk2IPMLxGQoTcnknoYEmMswpXn8Vm ROPXd2XmOyL5R/rH8znHLIuXj8g6S5j8yBrS5OAAnG+Hl0KVSqXvovgps7cjaymO oRSUhQtAenz3o= 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:references:mime-version:content-type :in-reply-to; s=default; bh=TQxi/NWjO2qpBxfr1owCDwXZbX8=; b=i1uS doi97HlfqhrkEP1Xc9LTuYmIyj0TykCM+pHBBzxbQ1hiRmjO6uTaG2SpzgIxMYQk O0oLM7ytEJaJFYjNc/bVwYuBwyyo981uSv3X0KA8dzaH3QA1RqwKCC5N3LeoY4wY Ocz2U5N9V9PMH+osfjagolLAiRCbqRV1qYG4rvk= Received: (qmail 81733 invoked by alias); 7 Dec 2016 15:28:47 -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 81679 invoked by uid 89); 7 Dec 2016 15:28:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=4188 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 ESMTP; Wed, 07 Dec 2016 15:28:37 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 67A1DC05AA48; Wed, 7 Dec 2016 15:28:35 +0000 (UTC) Received: from localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB7FSYBF006955; Wed, 7 Dec 2016 10:28:35 -0500 Date: Wed, 7 Dec 2016 15:28:34 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 2/2] Replace uses of C++14 remove_cv_t alias in C++11 header Message-ID: <20161207152834.GX6326@redhat.com> References: <20161207152714.GA20510@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161207152714.GA20510@redhat.com> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.7.1 (2016-10-04) Most filesystem tests test fail when run with -std=gnu++11 * include/experimental/bits/fs_path.h (path::_S_convert): * Replace uses of C++14 std::remove_cv_t alias template. Tested x86_64-linux, committed to trunk. commit c5d7518d15c540541a77e997ba4bb6d33703bedd Author: Jonathan Wakely Date: Wed Dec 7 14:33:24 2016 +0000 Replace uses of C++14 remove_cv_t alias in C++11 header * include/experimental/bits/fs_path.h (path::_S_convert): Replace uses of C++14 std::remove_cv_t alias template. diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h index 70a5445..a69fb9d 100644 --- a/libstdc++-v3/include/experimental/bits/fs_path.h +++ b/libstdc++-v3/include/experimental/bits/fs_path.h @@ -418,7 +418,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 _S_convert(_Iter __first, _Iter __last) { using __value_type = typename std::iterator_traits<_Iter>::value_type; - return _Cvt>::_S_convert(__first, __last); + return _Cvt::type>:: + _S_convert(__first, __last); } template @@ -426,7 +427,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 _S_convert(_InputIterator __src, __null_terminated) { using _Tp = typename std::iterator_traits<_InputIterator>::value_type; - std::basic_string> __tmp; + std::basic_string::type> __tmp; for (; *__src != _Tp{}; ++__src) __tmp.push_back(*__src); return _S_convert(__tmp.c_str(), __tmp.c_str() + __tmp.size());