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.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121297 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 11 insertions, 11 deletions

diff --git a/libstdc++-v3/docs/html/22_locale/codecvt.html b/libstdc++-v3/docs/html/22_locale/codecvt.html
index fe5457584b3..b2e10b13292 100644
--- a/libstdc++-v3/docs/html/22_locale/codecvt.html
+++ b/libstdc++-v3/docs/html/22_locale/codecvt.html
@@ -315,7 +315,7 @@ to wchar_t and wcsrtombs for conversions between wchar_t and char.
 <p>
 Neither of these two required specializations deals with Unicode
 characters. As such, libstdc++-v3 implements a partial specialization
-of the codecvt class with and iconv wrapper class, __enc_traits as the
+of the codecvt class with and iconv wrapper class, encoding_state as the
 third template parameter.
 </p>
 
@@ -331,19 +331,19 @@ constructible.
 </p>
 
 <p>
-As such, the type __enc_traits is defined as a non-templatized, POD
+As such, the type encoding_state is defined as a non-templatized, POD
 type to be used as the third type of a codecvt instantiation. This
 type is just a wrapper class for iconv, and provides an easy interface
 to iconv functionality.
 </p>
 
 <p>
-There are two constructors for __enc_traits:
+There are two constructors for encoding_state:
 </p>
 
 <p>
 <code> 
-__enc_traits() : __in_desc(0), __out_desc(0)
+encoding_state() : __in_desc(0), __out_desc(0)
 </code>
 </p>
 <p>
@@ -354,7 +354,7 @@ nl_langinfo(CODESET).
 
 <p>
 <code> 
-__enc_traits(const char* __int, const char* __ext)
+encoding_state(const char* __int, const char* __ext)
 </code>
 </p>
 <p>
@@ -382,7 +382,7 @@ _M_init()
 </p>
 <p>
 Strangely enough, this member function attempts to open conversion
-descriptors for a given __enc_traits object. If the conversion
+descriptors for a given encoding_state object. If the conversion
 descriptors are not valid, the conversion descriptors returned will
 not be valid and the resulting calls to the codecvt conversion
 functions will return error.
@@ -395,7 +395,7 @@ _M_good()
 </code>
 </p>
 <p>
-Provides a way to see if the given __enc_traits object has been
+Provides a way to see if the given encoding_state object has been
 properly initialized. If the string literals describing the desired
 internal and external encoding are not valid, initialization will
 fail, and this will return false. If the internal and external
@@ -406,7 +406,7 @@ ready to convert and will return true.
 
 <p>
 <code> 
-__enc_traits(const __enc_traits&amp;)
+encoding_state(const encoding_state&amp;)
 </code>
 </p>
 <p>
@@ -419,7 +419,7 @@ themselves.
 <p>
 Definitions for all the required codecvt member functions are provided
 for this specialization, and usage of codecvt&lt;internal character type,
-external character type, __enc_traits&gt; is consistent with other
+external character type, encoding_state&gt; is consistent with other
 codecvt usage.
 </p>
 
@@ -436,8 +436,8 @@ codecvt usage.
   typedef unsigned short                        unicode_t;
   typedef unicode_t                             int_type;
   typedef char                                  ext_type;
-  typedef __enc_traits                          enc_type;
-  typedef codecvt&lt;int_type, ext_type, enc_type&gt; unicode_codecvt;
+  typedef encoding_state                          state_type;
+  typedef codecvt&lt;int_type, ext_type, state_type&gt; unicode_codecvt;
 
   const ext_type*       e_lit = "black pearl jasmine tea";
   int                   size = strlen(e_lit);