From patchwork Thu Feb 23 22:22:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 142723 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 AFCE1B6FA5 for ; Fri, 24 Feb 2012 09:22:58 +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=1330640580; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC: Subject:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=koD6228h1t1S2kLxK+uw5DSRUXE=; b=C9adyap+V0eLwD5 OyhYDI3RKcQ7wTjqkSHXOXfGgAJhpmKAtGgQjGNJiCqNrgbZkK4fZPw6WKVS15ki MhgQWI+aK5DeSSE6of6d4qoFBI76HhuWnss9WYlLCiwSr4r708513okLaT3RWRJC K3y6lDdJpAKPsB6DDxIjxFsH3phk= 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:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=MHbRqfQ82AeYcuaDtaSrWnZVDf5pHtJcU7ycVfbTuz7vemn4FXIEWHPIpE/ubZ LanohL5Vz0pskOUvyMY1AQZbcdMYiYo+2SJDHCwMpNFyiFvmEo9VEntZB/9eDPbP lrNDUTuygucpkuew1AEscPOW9fe+oG5HUavUz8I08H3CA=; Received: (qmail 3579 invoked by alias); 23 Feb 2012 22:22:55 -0000 Received: (qmail 3563 invoked by uid 22791); 23 Feb 2012 22:22:53 -0000 X-SWARE-Spam-Status: No, hits=-6.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 23 Feb 2012 22:22:38 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1NMMcFB001615 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 23 Feb 2012 17:22:38 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q1NMMbD0027443; Thu, 23 Feb 2012 17:22:37 -0500 Received: from [0.0.0.0] (ovpn-113-101.phx2.redhat.com [10.3.113.101]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id q1NMMZqF029767; Thu, 23 Feb 2012 17:22:36 -0500 Message-ID: <4F46BC2B.1060604@redhat.com> Date: Thu, 23 Feb 2012 17:22:35 -0500 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:10.0.1) Gecko/20120209 Thunderbird/10.0.1 MIME-Version: 1.0 To: gcc-patches List CC: libstdc++ , Benjamin Kosnik Subject: v3 PATCH to include/bits/locale_facets.h to revert reordering of virtual functions 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 Benjamin's patch of 2011-08-06 (r177542) to clean up doxygen markup changed the order of the num_get::do_get virtual functions. This breaks ABI compatibility, so I'm reverting the change. Tested x86_64-pc-linux-gnu, applied to trunk. commit f8566d7934d5ab7006548fa67d596cac2c346d3e Author: Jason Merrill Date: Thu Feb 23 16:59:04 2012 -0500 * include/bits/locale_facets.h (class num_get): Undo reordering of do_get virtual functions. diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index 3b3139f..dc95f5a 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -2169,6 +2169,9 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL * @return Iterator after reading. */ virtual iter_type + do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const; + + virtual iter_type do_get(iter_type __beg, iter_type __end, ios_base& __io, ios_base::iostate& __err, long& __v) const { return _M_extract_int(__beg, __end, __io, __err, __v); } @@ -2201,9 +2204,6 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL #endif virtual iter_type - do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const; - - virtual iter_type do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, float&) const; virtual iter_type