From 17e2915c2784aa8fc76147e603a7fdc543acd158 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 7 Jun 2005 02:55:06 +0000 Subject: [PATCH] PR libstdc++/21770 (cont: __gnu_debug::string) 2005-06-06 Paolo Carlini PR libstdc++/21770 (cont: __gnu_debug::string) * include/debug/string: Use _Base typedefs for pointer, const_pointer, reference, const_reference, size_type, difference_type. * testsuite/21_strings/basic_string/2.cc: New. From-SVN: r100693 --- libstdc++-v3/ChangeLog | 7 ++++ libstdc++-v3/include/debug/string | 12 +++---- .../testsuite/21_strings/basic_string/2.cc | 36 +++++++++++++++++++ 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/2.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4580ebbad5e..3522320468d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2005-06-06 Paolo Carlini + + PR libstdc++/21770 (cont: __gnu_debug::string) + * include/debug/string: Use _Base typedefs for pointer, const_pointer, + reference, const_reference, size_type, difference_type. + * testsuite/21_strings/basic_string/2.cc: New. + 2005-06-06 Paolo Carlini PR libstdc++/21770 (cont: debug-mode) diff --git a/libstdc++-v3/include/debug/string b/libstdc++-v3/include/debug/string index 3893cd2b5f6..26a1582d3d8 100644 --- a/libstdc++-v3/include/debug/string +++ b/libstdc++-v3/include/debug/string @@ -52,12 +52,12 @@ template, typedef _Traits traits_type; typedef typename _Traits::char_type value_type; typedef _Allocator allocator_type; - typedef typename _Allocator::size_type size_type; - typedef typename _Allocator::difference_type difference_type; - typedef typename _Allocator::reference reference; - typedef typename _Allocator::const_reference const_reference; - typedef typename _Allocator::pointer pointer; - typedef typename _Allocator::const_pointer const_pointer; + typedef typename _Base::size_type size_type; + typedef typename _Base::difference_type difference_type; + typedef typename _Base::reference reference; + typedef typename _Base::const_reference const_reference; + typedef typename _Base::pointer pointer; + typedef typename _Base::const_pointer const_pointer; typedef __gnu_debug::_Safe_iterator iterator; diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/2.cc new file mode 100644 index 00000000000..36322929ac7 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/2.cc @@ -0,0 +1,36 @@ +// Copyright (C) 2005 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// This file tests explicit instantiation of basic_string + +#include + +// { dg-do compile } + +// libstdc++/21770 +template class __gnu_debug::basic_string, + std::allocator >; -- 2.30.2