From patchwork Mon Sep 15 11:01:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 389261 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 2A03414013A for ; Mon, 15 Sep 2014 21:01:28 +1000 (EST) 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=bhT0vV9NOuIqih/xgt/PpK6gVKTljUyfkfXkj3BkMBw3gZhiwBxwG Mk05Vh15w5RPiN5GeOVSCKa+zjAXMeN+LT8kIlwGpHcQwOm16Obdzfj6mZ6Mf9Oz Rfqe4FlUYERbUXKTpxDL9I/5eV+D6OojklwRHG6vsaS8OpgI5vZvk0= 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=laTulPR5lKrRWS8gqlgozsMdfoY=; b=yeKJJGG8Q7gUPv7Rzp4v Dn+ei3fMkPfr7k1W59sAMA1lnAoKf468kXPrWl4wQxq5HAcIsDrnTGULStYfEAS2 QqAebxqEKRMq41MBv/UhV4HCEgjWDRx3CeVMp0ZHG0FDIvMg/zs22iNsibdDXJ+m WQCOr6Eu/ocDShQoSx6xT60= Received: (qmail 8988 invoked by alias); 15 Sep 2014 11:01:21 -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 8969 invoked by uid 89); 15 Sep 2014 11:01:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS 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; Mon, 15 Sep 2014 11:01:19 +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 s8FB1IfB001455 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 Sep 2014 07:01:18 -0400 Received: from localhost (ovpn-116-77.ams2.redhat.com [10.36.116.77]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8FB1H91011140; Mon, 15 Sep 2014 07:01:18 -0400 Date: Mon, 15 Sep 2014 12:01:17 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [patch] Rename template parameters in std::regex Message-ID: <20140915110117.GT22778@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Fix an over-eager find'n'replace. Tested x86_64-linux, committed to trunk. commit 3e9a05fcd4278438229a6d1515ad0d6d3b17f4a9 Author: Jonathan Wakely Date: Mon Sep 15 11:13:52 2014 +0100 * include/bits/regex.h (basic_regex): Rename _Ch_typeraits template parameters to _Ch_traits. diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 9dc83fd..5205089 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -577,9 +577,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * * @param __s A pointer to a string containing a regular expression. */ - template + template basic_regex& - operator=(const basic_string<_Ch_type, _Ch_typeraits, _Alloc>& __s) + operator=(const basic_string<_Ch_type, _Ch_traits, _Alloc>& __s) { return this->assign(__s, flags()); } // [7.8.3] assign @@ -654,9 +654,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * expression pattern interpreted according to @p __flags. If * regex_error is thrown, *this remains unchanged. */ - template + template basic_regex& - assign(const basic_string<_Ch_type, _Ch_typeraits, _Alloc>& __s, + assign(const basic_string<_Ch_type, _Ch_traits, _Alloc>& __s, flag_type __flags = ECMAScript) { _M_flags = __flags;