From patchwork Wed Jan 29 20:43:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 315214 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 C89382C00D0 for ; Thu, 30 Jan 2014 07:44:09 +1100 (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=OgvEkBSOsWxhUDuF7ZCOQZf5mNtaDXT4noWS6rlXmPgoMQBmnd3bD vVD5To2OBPlRfsWRxMu8LBF93UMMThu4QkN7S6wEDz2D/ajMBGbWTE3Fvm8xj2vH eGE0b2WRWTnSNJEoSOd/YoXYegKjnVLTGp48LAXDyLU1DwcFSYRc64= 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=K2WABa31B3szf0IscdGwd76Skes=; b=LP+IZLX4dOh6xhg60BSa v7xQi3J6uwY6GJBZzQ4bkZkEGU2ze+Y8ZzozwkO660W0Sa8KXQjdgxPVor1i8the aDFMz3IFHjM7aCvxTwMDhXc+EhAhIr/LQfr8mkLG64x5ahHWzBSL7t19Y8IUsCyT IoDtoCXGdUCI4YctDuR1Y80= Received: (qmail 8984 invoked by alias); 29 Jan 2014 20:43:53 -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 8960 invoked by uid 89); 29 Jan 2014 20:43:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 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 ESMTP; Wed, 29 Jan 2014 20:43:52 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0TKhpRg022430 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 29 Jan 2014 15:43:51 -0500 Received: from localhost (vpn1-7-88.ams2.redhat.com [10.36.7.88]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0TKhoSD031531; Wed, 29 Jan 2014 15:43:50 -0500 Date: Wed, 29 Jan 2014 20:43:49 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [patch] fix libstdc++/21609 - deprecate __gnu_cxx::array_allocator Message-ID: <20140129204349.GA13974@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) This deprecates this GNU extension which isn't really a conforming allocator anyway. PR libstdc++/21609 * include/ext/array_allocator.h: Add deprecated attribute. Tested x86_64-linux, committed to trunk. I'll update the gcc-4.9/changes.html page to note this. commit e6682598d14537b97975e0dc5ee8a96353af2712 Author: Jonathan Wakely Date: Wed Jan 29 20:20:57 2014 +0000 PR libstdc++/21609 * include/ext/array_allocator.h: Add deprecated attribute. diff --git a/libstdc++-v3/include/ext/array_allocator.h b/libstdc++-v3/include/ext/array_allocator.h index f584b5b..f807495 100644 --- a/libstdc++-v3/include/ext/array_allocator.h +++ b/libstdc++-v3/include/ext/array_allocator.h @@ -95,7 +95,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION void destroy(pointer __p) { __p->~_Tp(); } #endif - }; + } _GLIBCXX_DEPRECATED; /** * @brief An allocator that uses previously allocated memory. @@ -128,7 +128,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION public: template struct rebind - { typedef array_allocator<_Tp1, _Array1> other; }; + { + typedef array_allocator<_Tp1, _Array1> other _GLIBCXX_DEPRECATED; + } _GLIBCXX_DEPRECATED; array_allocator(array_type* __array = 0) _GLIBCXX_USE_NOEXCEPT : _M_array(__array), _M_used(size_type()) { } @@ -152,7 +154,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_used += __n; return __ret; } - }; + } _GLIBCXX_DEPRECATED; template inline bool