This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] ext/pod_char_traits.cc fix
- From: Benjamin Kosnik <bkoz at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 25 Jul 2003 12:34:41 -0400 (EDT)
- Subject: [v3] ext/pod_char_traits.cc fix
Fixes ext/pod_char_traits.cc after the recent char_traits work.
tested x86/linux
2003-07-25 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/char_traits.h: Update copyright, tweak.
* testsuite/ext/pod_char_traits.cc: Explicitly qualifiy namespace
std types.
Index: include/bits/char_traits.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/char_traits.h,v
retrieving revision 1.20
diff -c -p -r1.20 char_traits.h
*** include/bits/char_traits.h 25 Jul 2003 05:32:22 -0000 1.20
--- include/bits/char_traits.h 25 Jul 2003 16:32:31 -0000
***************
*** 1,6 ****
// Character Traits for use by standard string and iostream -*- C++ -*-
! // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
--- 1,6 ----
// Character Traits for use by standard string and iostream -*- C++ -*-
! // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
***************
*** 48,54 ****
namespace __gnu_cxx
{
-
/**
* @brief Mapping from character type to associated types.
*
--- 48,53 ----
*************** namespace std
*** 224,230 ****
*/
template<class _CharT>
struct char_traits
! : public __gnu_cxx::char_traits<_CharT>
{ };
--- 223,229 ----
*/
template<class _CharT>
struct char_traits
! : public __gnu_cxx::char_traits<_CharT>
{ };
Index: testsuite/ext/pod_char_traits.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/ext/pod_char_traits.cc,v
retrieving revision 1.1
diff -c -p -r1.1 pod_char_traits.cc
*** testsuite/ext/pod_char_traits.cc 9 Jul 2003 00:40:29 -0000 1.1
--- testsuite/ext/pod_char_traits.cc 25 Jul 2003 16:32:34 -0000
***************
*** 34,40 ****
int main()
{
- using namespace std;
using namespace __gnu_cxx;
typedef unsigned short value_type;
--- 34,39 ----
*************** int main()
*** 55,61 ****
test = traits_type::eq(c1, c2);
// 3 basic_string<char_type>
! typedef basic_string<char_type> string_type;
string_type str;
char_type c3 = { value_type('b') };
char_type c4 = { value_type('o') };
--- 54,60 ----
test = traits_type::eq(c1, c2);
// 3 basic_string<char_type>
! typedef std::basic_string<char_type> string_type;
string_type str;
char_type c3 = { value_type('b') };
char_type c4 = { value_type('o') };