diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2007-01-29 18:22:37 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2007-01-29 18:22:37 +0000 |
| commit | 4ffe6e87dc5f2aecddf83192b7528202f647faaa (patch) | |
| tree | da98ca8f6597468843b19cf9367201ffebc2b1e8 /libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc | |
| parent | 68254f23e8c232a4da9b6f0e3fdabe1800a4b014 (diff) | |
| download | gcc-4ffe6e87dc5f2aecddf83192b7528202f647faaa.zip gcc-4ffe6e87dc5f2aecddf83192b7528202f647faaa.tar.gz gcc-4ffe6e87dc5f2aecddf83192b7528202f647faaa.tar.bz2 | |
enc_filebuf.h: Resurrect, update.
2007-01-29 Benjamin Kosnik <bkoz@redhat.com>
* include/ext/enc_filebuf.h: Resurrect, update.
* include/ext/codecvt_specializations.h: Remove
_GLIBCXX_USE_ICONV, _GLIBCXX_USE_ENCODING_STATE.
* include/bits/localefwd.h: Remove declaration for __enc_traits.
* docs/html/22_locale/codecvt.html: Change __enc_traits to
encoding_state.
* scripts/testsuite_flags.in: Remove ICONV.
* configure.ac: Remove GLIBCXX_CHECK_ICONV_SUPPORT.
* acinclude.m4 (GLIBCXX_CHECK_ICONV_SUPPORT): Remove.
* crossconfig.m4: Remove use of GLIBCXX_CHECK_ICONV_SUPPORT.
* config.h.in: Remove HAVE_ICONV_CLOSE, HAVE_ICONV_OPEN,
HAVE_NL_LANGINFO, _GLIBCXX_USE_ICONV.
* include/Makefile.am: Uglify ICONV_CONST.
* configure: Regenerate.
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* libmath/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* testsuite/ext/enc_filebuf/wchar_t/13189.cc: Use
dg-require-iconv, fix up for encoding_state changes.
* testsuite/ext/enc_filebuf/char/13189.cc: Same.
* testsuite/ext/enc_filebuf/char/13598.cc: Same.
* testsuite/22_locale/codecvt/unicode: Move...
* testsuite/22_locale/codecvt/unicode/char.cc: Move...
* testsuite/22_locale/codecvt/unicode/1.cc: Move...
* testsuite/22_locale/codecvt/unicode/wchar_t.cc: Move...
* testsuite/ext/codecvt: New.
* testsuite/ext/codecvt/char-1.cc: ...here. Also, use dg-require-iconv.
* testsuite/ext/codecvt/char-2.cc: ...here. Same.
* testsuite/ext/codecvt/1.cc: ...here. Same.
* testsuite/ext/codecvt/wchar_t.cc: ...here. Same.
* testsuite/22_locale/locale/cons/unicode: Delete directory.
* testsuite/22_locale/locale/cons/unicode/1.cc: Move...
* testsuite/22_locale/locale/cons/unicode.cc: ...here.
From-SVN: r121297
Diffstat (limited to 'libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc')
| -rw-r--r-- | libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc b/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc index a74c846..9dc4152 100644 --- a/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc +++ b/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc @@ -1,4 +1,6 @@ -// Copyright (C) 2003, 2004, 2005 Free Software Foundation +// { dg-require-iconv "ISO-8859-1" } + +// Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation // // 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 @@ -17,17 +19,14 @@ // USA. #include <testsuite_hooks.h> -#ifdef _GLIBCXX_USE___ENC_TRAITS #include <ext/enc_filebuf.h> -#endif void test01() { -#ifdef _GLIBCXX_USE___ENC_TRAITS using namespace std; - typedef __enc_traits state_type; typedef wchar_t char_type; typedef __gnu_cxx::enc_filebuf<char_type> filebuf_type; + typedef filebuf_type::state_type state_type; typedef codecvt<char_type, char, state_type> enc_codecvt; bool test __attribute__((unused)) = true; @@ -47,7 +46,6 @@ void test01() catch(...) { } -#endif } int main() |