From patchwork Fri Oct 5 17:42:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 189542 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 52F622C008E for ; Sat, 6 Oct 2012 03:42:38 +1000 (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=1350063759; h=Comment: DomainKey-Signature:Received: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=QhQiocCQ5qASB2m77r8XoaVnYLI=; b=vcxp/Jd4dq67wzP 14QVe76nZ/vK02pGoenH1FU4E+SBe8kVvHG9MnRYkyCDcbUAjJ/qAcmXjRVshw+U VEQDztdnlYCeeNJoehCFehulC2oCIiXesGyogk+7XhtWdicSxN35xCsPmjvbZt0d q66SCcxx/+uZzCLxIW0ExGfSXvPE= 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:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=TGlIMwnUqlMD7OisTDjDzgpkbU5wrWajzMDxc4NW44W3Dol1SkBl3M29lPRKLd JqFB4iE1t+CR4+0nD8QKYwceCdDph74GVefdbwuIPVQcMMIi39oF3aNHdmJis4HA P2711vy7/HOEFF6dlDksVZY3mJiHj6zGfvsj/LxpKZjeY=; Received: (qmail 16352 invoked by alias); 5 Oct 2012 17:42:33 -0000 Received: (qmail 16335 invoked by uid 22791); 5 Oct 2012 17:42:31 -0000 X-SWARE-Spam-Status: No, hits=-7.8 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_NO, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD, TW_FN X-Spam-Check-By: sourceware.org Received: from rcsinet15.oracle.com (HELO rcsinet15.oracle.com) (148.87.113.117) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 05 Oct 2012 17:42:26 +0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q95HgNIM018490 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Oct 2012 17:42:24 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q95HgNpH005598 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 5 Oct 2012 17:42:23 GMT Received: from abhmt120.oracle.com (abhmt120.oracle.com [141.146.116.72]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q95HgNK8032077; Fri, 5 Oct 2012 12:42:23 -0500 Received: from [192.168.1.4] (/79.47.194.224) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 05 Oct 2012 10:42:23 -0700 Message-ID: <506F1BFC.4060008@oracle.com> Date: Fri, 05 Oct 2012 19:42:20 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120825 Thunderbird/15.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: libstdc++ Subject: [v3] Remove cruft ;) X-IsSubscribed: yes 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 Hi, remove some cruft noticed by Marc (and myself). Sanity checked x86_64-linux, committed to mainline. Thanks, Paolo. ////////////////// 2012-10-05 Paolo Carlini * include/c_global/cstdlib: Remove redundant pasto code protected by __GXX_EXPERIMENTAL_CXX0X__. * include/c_global/cwctype: Likewise. * include/c_global/ccomplex: Remove uses of obsolete macro _GLIBCXX_INCLUDE_AS_TR1. * include/c_global/cfloat: Likewise. Index: include/c_global/cstdlib =================================================================== --- include/c_global/cstdlib (revision 192130) +++ include/c_global/cstdlib (working copy) @@ -1,8 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010, 2011 -// Free Software Foundation, Inc. +// Copyright (C) 1997-2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -221,35 +219,6 @@ using ::__gnu_cxx::strtold; } // namespace std -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - -namespace std -{ -#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC - // types - using std::lldiv_t; - - // functions - using std::llabs; - using std::lldiv; -#endif - - using std::atoll; - using std::strtoll; - using std::strtoull; - - using std::strtof; - using std::strtold; - - // overloads - using std::abs; -#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC - using std::div; -#endif -} // namespace std - -#endif // __GXX_EXPERIMENTAL_CXX0X__ - #endif // _GLIBCXX_USE_C99 #endif // !_GLIBCXX_HOSTED Index: include/c_global/cfloat =================================================================== --- include/c_global/cfloat (revision 192130) +++ include/c_global/cfloat (working copy) @@ -1,8 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 -// Free Software Foundation, Inc. +// Copyright (C) 1997-2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -46,9 +44,6 @@ #define _GLIBCXX_CFLOAT 1 #ifdef __GXX_EXPERIMENTAL_CXX0X__ -# if defined(_GLIBCXX_INCLUDE_AS_TR1) -# error C++0x header cannot be included from TR1 header -# endif # ifndef DECIMAL_DIG # define DECIMAL_DIG __DECIMAL_DIG__ # endif Index: include/c_global/ccomplex =================================================================== --- include/c_global/ccomplex (revision 192130) +++ include/c_global/ccomplex (working copy) @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2007-2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -35,10 +35,6 @@ # include #endif -#if defined(_GLIBCXX_INCLUDE_AS_TR1) -# error C++0x header cannot be included from TR1 header -#endif - #include #endif Index: include/c_global/cwctype =================================================================== --- include/c_global/cwctype (revision 192130) +++ include/c_global/cwctype (working copy) @@ -1,8 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 -// Free Software Foundation, Inc. +// Copyright (C) 1997-2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -109,19 +107,4 @@ #endif //_GLIBCXX_USE_WCHAR_T -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - -#ifdef _GLIBCXX_USE_WCHAR_T - -namespace std -{ -#if _GLIBCXX_HAVE_ISWBLANK - using std::iswblank; -#endif -} // namespace - -#endif // _GLIBCXX_USE_WCHAR_T - -#endif // __GXX_EXPERIMENTAL_CXX0X__ - #endif // _GLIBCXX_CWCTYPE