From patchwork Sun Sep 30 15:36:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 188170 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 7F1912C00C0 for ; Mon, 1 Oct 2012 01:36:39 +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=1349624199; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:In-Reply-To:References:Date: Message-ID:Subject:From:To:Cc:Content-Type:Mailing-List: Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:Sender:Delivered-To; bh=sg8Cxy9tLp98/r42O3tsj/SE9yk=; b=OM3X/D+mCMQ73PSJZ5kzVXkEgxsGC8kjOmQJPXwXHmYJV+R6mhIPfGEJWkxBo0 YpkdIUNa5iF9vOTlsGdpDpwHT/seCy2KRXElkomqzGhIVl5cm41o3FFTqSoWRhOT cn2zx8ajo4/38axU1SaTncnwMkugC0vkrsSqZDuhIoxYU= 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:MIME-Version:Received:Received:In-Reply-To:References:Date:Message-ID:Subject:From:To:Cc:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=DMNdgkFR6e3PVuDO+ZZpCt17OEZNqc0p9mrbWKquSXedqBI2kYjkMHZbXJbr4A YT8uWGxAgaQwQ3d9IqM9w5zHh+e1gosC0ZEJAFVd3GfAcNSh+Tak/78RI9ibzkQw ydy0jxcGL76ugQKwu3gaMsgxC+ly0yppoA0ggIiWukVec=; Received: (qmail 21847 invoked by alias); 30 Sep 2012 15:36:35 -0000 Received: (qmail 21834 invoked by uid 22791); 30 Sep 2012 15:36:34 -0000 X-SWARE-Spam-Status: No, hits=-5.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-ie0-f175.google.com (HELO mail-ie0-f175.google.com) (209.85.223.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 30 Sep 2012 15:36:29 +0000 Received: by iebc13 with SMTP id c13so12557290ieb.20 for ; Sun, 30 Sep 2012 08:36:28 -0700 (PDT) MIME-Version: 1.0 Received: by 10.50.104.230 with SMTP id gh6mr3472149igb.50.1349019388504; Sun, 30 Sep 2012 08:36:28 -0700 (PDT) Received: by 10.42.197.202 with HTTP; Sun, 30 Sep 2012 08:36:28 -0700 (PDT) In-Reply-To: References: Date: Sun, 30 Sep 2012 16:36:28 +0100 Message-ID: Subject: Re: __gnu_cxx::rope: __uninitialized_fill_n_a error From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches Cc: Gross David 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 This fixes a lookup failure when using ropes with an allocator declared outside namespace std, introduced by http://gcc.gnu.org/ml/libstdc++/2004-07/msg00157.html * include/ext/ropeimpl.h (__uninitialized_fill_n_a): Fix using declaration. * testsuite/ext/rope/5.cc: New. Tested x86_64-linux, committed to trunk. commit 293275915de97fc9a627d27a4b8d3143f398486e Author: Jonathan Wakely Date: Sun Sep 30 15:53:11 2012 +0100 * include/ext/ropeimpl.h (__uninitialized_fill_n_a): Fix using declaration. * testsuite/ext/rope/5.cc: New. diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h index 3ee0610..5a68c18 100644 --- a/libstdc++-v3/include/ext/ropeimpl.h +++ b/libstdc++-v3/include/ext/ropeimpl.h @@ -58,7 +58,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using std::basic_ostream; using std::__throw_length_error; using std::_Destroy; - using std::uninitialized_fill_n; + using std::__uninitialized_fill_n_a; // Set buf_start, buf_end, and buf_ptr appropriately, filling tmp_buf // if necessary. Assumes _M_path_end[leaf_index] and leaf_pos are correct. diff --git a/libstdc++-v3/testsuite/ext/rope/5.cc b/libstdc++-v3/testsuite/ext/rope/5.cc new file mode 100644 index 0000000..73e8294 --- /dev/null +++ b/libstdc++-v3/testsuite/ext/rope/5.cc @@ -0,0 +1,26 @@ +// Copyright (C) 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 +// 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 even 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 +// . + +// rope (SGI extension) +// http://gcc.gnu.org/ml/libstdc++/2012-09/msg00204.html + +// { dg-do compile } + +#include +#include + +__gnu_cxx::rope > r(10, 'a');