From patchwork Thu Aug 5 08:47:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 60938 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 42F5D1007D4 for ; Thu, 5 Aug 2010 18:48:24 +1000 (EST) Received: (qmail 29757 invoked by alias); 5 Aug 2010 08:48:21 -0000 Received: (qmail 29739 invoked by uid 22791); 5 Aug 2010 08:48:16 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY X-Spam-Check-By: sourceware.org Received: from rcsinet10.oracle.com (HELO rcsinet10.oracle.com) (148.87.113.121) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 05 Aug 2010 08:47:50 +0000 Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o758lle1008450 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 5 Aug 2010 08:47:48 GMT Received: from acsmt353.oracle.com (acsmt353.oracle.com [141.146.40.153]) by acsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o750PxD3030272 for ; Thu, 5 Aug 2010 08:47:46 GMT Received: from abhmt009.oracle.com by acsmt354.oracle.com with ESMTP id 486994441280998048; Thu, 05 Aug 2010 01:47:28 -0700 Received: from macbook-pro-di-paolo-carlini.local (/152.96.0.2) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 05 Aug 2010 01:47:28 -0700 Message-ID: <4C5A7A9D.60809@oracle.com> Date: Thu, 05 Aug 2010 10:47:25 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; it; rv:1.9.2.7) Gecko/20100713 Thunderbird/3.1.1 MIME-Version: 1.0 To: Gcc Patch List CC: libstdc++ Subject: [v3] Implement GB 85 and JP 3 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, committed to mainline. Paolo. ////////// 2010-08-05 Paolo Carlini * include/tr1_impl/utility (begin, end): Remove per GB 85. * testsuite/20_util/pair/range_access.cc: Remove. * include/std/functional (function<>::function()): Remove explicit, per JP 3. Index: include/tr1_impl/utility =================================================================== --- include/tr1_impl/utility (revision 162897) +++ include/tr1_impl/utility (working copy) @@ -1,6 +1,6 @@ // TR1 utility -*- C++ -*- -// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010 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 @@ -115,26 +115,6 @@ get(const std::pair<_Tp1, _Tp2>& __in) { return __pair_get<_Int>::__const_get(__in); } -#ifdef _GLIBCXX_INCLUDE_AS_CXX0X - /** - * @brief Return the first of a pair containing two input iterators. - * @param p Pair. - */ - template - inline _InputIterator - begin(const std::pair<_InputIterator, _InputIterator>& __p) - { return __p.first; } - - /** - * @brief Return the second of a pair containing two input iterators. - * @param p Pair. - */ - template - inline _InputIterator - end(const std::pair<_InputIterator, _InputIterator>& __p) - { return __p.second; } -#endif - _GLIBCXX_END_NAMESPACE_TR1 } Index: include/std/functional =================================================================== --- include/std/functional (revision 162897) +++ include/std/functional (working copy) @@ -1786,7 +1786,6 @@ * @brief Default construct creates an empty function call wrapper. * @post @c !(bool)*this */ - explicit function() : _Function_base() { } /** Index: testsuite/20_util/pair/range_access.cc =================================================================== --- testsuite/20_util/pair/range_access.cc (revision 162897) +++ testsuite/20_util/pair/range_access.cc (working copy) @@ -1,33 +0,0 @@ -// { dg-do compile } -// { dg-options "-std=gnu++0x" } - -// Copyright (C) 2010 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 -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without Pred the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// . - -// 20.3.5.4, pair range access: [pair.range] - -#include -#include - -void -test01() -{ - std::vector v{1.0, 2.0, 3.0}; - auto p = std::make_pair(v.begin(), v.end()); - std::begin(p); - std::end(p); -}