diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2003-07-25 16:35:39 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2003-07-25 16:35:39 +0000 |
| commit | b66ea7d48d51b1d8eedc0fe46eb7812999fafa1d (patch) | |
| tree | fe6c484fb2c914a439c35464bb3fd0c07b45e6d0 | |
| parent | 22038b2cf5871bdb8613ef35358bc87e478696cf (diff) | |
| download | gcc-b66ea7d48d51b1d8eedc0fe46eb7812999fafa1d.zip gcc-b66ea7d48d51b1d8eedc0fe46eb7812999fafa1d.tar.gz gcc-b66ea7d48d51b1d8eedc0fe46eb7812999fafa1d.tar.bz2 | |
char_traits.h: Update copyright, tweak.
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.
From-SVN: r69791
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/char_traits.h | 5 | ||||
| -rw-r--r-- | 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 f2925d0..39882a3 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +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. + 2003-07-24 Matt Austern <austern@apple.com> * /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 23b69f3..424fd08 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<class _CharT> 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 c3c4eee..3db5a21 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<char_type> - typedef basic_string<char_type> string_type; + typedef std::basic_string<char_type> string_type; string_type str; char_type c3 = { value_type('b') }; char_type c4 = { value_type('o') }; |