From b66ea7d48d51b1d8eedc0fe46eb7812999fafa1d Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Fri, 25 Jul 2003 16:35:39 +0000 Subject: [PATCH] char_traits.h: Update copyright, tweak. 2003-07-25 Benjamin Kosnik * include/bits/char_traits.h: Update copyright, tweak. * testsuite/ext/pod_char_traits.cc: Explicitly qualifiy namespace std types. From-SVN: r69791 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/char_traits.h | 5 ++--- libstdc++-v3/testsuite/ext/pod_char_traits.cc | 3 +-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f2925d0e65e..39882a3f41a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2003-07-25 Benjamin Kosnik + + * include/bits/char_traits.h: Update copyright, tweak. + * testsuite/ext/pod_char_traits.cc: Explicitly qualifiy namespace + std types. + 2003-07-24 Matt Austern * /include/bits/char_traits.h (class char_traits): Put all the diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index 23b69f32bfd..424fd08c730 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -1,6 +1,6 @@ // Character Traits for use by standard string and iostream -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// 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,7 +48,6 @@ namespace __gnu_cxx { - /** * @brief Mapping from character type to associated types. * @@ -224,7 +223,7 @@ namespace std */ template struct char_traits - : public __gnu_cxx::char_traits<_CharT> + : public __gnu_cxx::char_traits<_CharT> { }; diff --git a/libstdc++-v3/testsuite/ext/pod_char_traits.cc b/libstdc++-v3/testsuite/ext/pod_char_traits.cc index c3c4eee2594..3db5a213291 100644 --- a/libstdc++-v3/testsuite/ext/pod_char_traits.cc +++ b/libstdc++-v3/testsuite/ext/pod_char_traits.cc @@ -34,7 +34,6 @@ int main() { - using namespace std; using namespace __gnu_cxx; typedef unsigned short value_type; @@ -55,7 +54,7 @@ int main() test = traits_type::eq(c1, c2); // 3 basic_string - typedef basic_string string_type; + typedef std::basic_string string_type; string_type str; char_type c3 = { value_type('b') }; char_type c4 = { value_type('o') };