2000-08-15 Benjamin Kosnik <bkoz@purist.soma.redhat.com>

	* bits/codecvt.h: New file.
	* src/codecvt.cc: New file.
	* bits/std_locale.h: Add include here.
	* src/Makefile.am (headers): Add codecvt.h
	(sources): Add codecvt.cc.
	* src/Makefile.in: Regenerate.
	* bits/locale_facets.h (codecvt): Re-implement. Rename _Codecvt to
	__codecvt_abstract_base in an attempt to point some light this way...
	Move __enc_traits and codecvt bits to codecvt.h.
	* src/locale-inst.cc: Remove codecvt<wchar_t, wchar_t, mbstate_t>
	explicit instantiation. Separate out codecvt instantations, simplify.
	* src/locale.cc: Move codecvt bits to codecvt.cc


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

1 files changed, 5 insertions, 7 deletions

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 4f0121044fb..216d265a71b 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -142,9 +142,7 @@ TOPLEVEL_INCLUDES = -I$(includedir)
 
 CONFIG_INCLUDES =  	-I$(top_srcdir)/@cpu_include_dir@ 	-I$(top_srcdir)/@ctype_include_dir@
 
-
-INCLUDES =  	-D_GNU_SOURCE -nostdinc++ -I$(top_srcdir) 	$(CSHADOW_INCLUDES) $(LIBIO_INCLUDES) 	$(CONFIG_INCLUDES) $(TOPLEVEL_INCLUDES)	
-
+INCLUDES = -D_GNU_SOURCE -nostdinc++ -I$(top_srcdir) $(CSHADOW_INCLUDES) $(LIBIO_INCLUDES) $(CONFIG_INCLUDES) $(TOPLEVEL_INCLUDES)
 
 # Need to explicitly set this so that AM_CXXFLAGS is last. (That way,
 # things like -O2 passed down from the toplevel can be overridden by
@@ -161,7 +159,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) 	       $(AM
 # course is impossible.
 CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
 
-headers =  	bits/cpp_type_traits.h 	bits/std_cctype.h bits/ctype_base.h bits/ctype_specializations.h 	bits/char_traits.h 	bits/basic_string.h bits/std_string.h  bits/string.tcc 	bits/generic_shadow.h bits/std_utility.h 	bits/std_complex.h 	bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h 	bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h 	bits/gslice.h bits/gslice_array.h bits/indirect_array.h 	bits/std_cassert.h bits/std_cwctype.h 	bits/std_cerrno.h bits/std_cfloat.h bits/std_climits.h 	bits/std_clocale.h bits/std_cmath.h 	bits/std_csetjmp.h bits/std_csignal.h bits/std_cstdarg.h 	bits/std_cstddef.h bits/std_cstdio.h bits/std_cstdlib.h 	bits/std_cstring.h bits/std_ctime.h bits/std_cwchar.h 	bits/std_typeinfo.h bits/std_new.h 	bits/std_exception.h bits/exception_support.h 	bits/std_fstream.h bits/std_iomanip.h 	bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc 	bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h 	bits/std_istream.h bits/istream.tcc bits/std_locale.h 	bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc 	bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h 	bits/streambuf.tcc bits/basic_file.h 	bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h 	bits/stl_pthread_alloc.h bits/pthread_allocimpl.h 	bits/stl_threads.h bits/stl_iterator_base.h 	backward/algo.h backward/algobase.h backward/alloc.h 	backward/bvector.h backward/defalloc.h backward/deque.h 	backward/function.h backward/hash_map.h backward/hash_set.h 	backward/hashtable.h backward/heap.h backward/iterator.h 	backward/list.h backward/map.h backward/multimap.h backward/new.h 	backward/multiset.h backward/pair.h backward/iostream.h 	backward/rope.h backward/set.h backward/slist.h backward/stack.h 	backward/tempbuf.h backward/tree.h backward/vector.h 	bits/std_bitset.h bits/std_deque.h bits/std_functional.h 	bits/std_iterator.h bits/std_list.h 	bits/std_map.h bits/std_memory.h bits/std_numeric.h 	bits/std_queue.h bits/std_set.h bits/std_stack.h 	bits/std_stdexcept.h bits/std_vector.h 	bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h 	bits/stl_deque.h bits/stl_function.h 	bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h 	bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h 	bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h 	bits/stl_relops.h bits/stl_set.h 	bits/stl_stack.h bits/stl_string_fwd.h bits/stl_tempbuf.h 	bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h 	bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h 	bits/concept_checks.h bits/container_concepts.h 	bits/sequence_concepts.h bits/std_strstream.h 	ext/ropeimpl.h ext/stl_rope.h 	ext/stl_bvector.h bits/stl_config.h bits/stl_construct.h 	ext/stl_hashtable.h ext/stl_hash_fun.h 	ext/hash_map ext/hash_set ext/rope ext/slist 	ext/tree ext/bvector 	shadow/assert.h shadow/ctype.h shadow/errno.h shadow/float.h 	shadow/libio.h 	shadow/limits.h shadow/locale.h shadow/math.h shadow/setjmp.h 	shadow/signal.h shadow/stdarg.h shadow/stddef.h shadow/stdio.h 	shadow/stdlib.h shadow/string.h shadow/time.h 	shadow/unistd.h shadow/wchar.h shadow/wctype.h 	shadow/bits/std_cassert.h shadow/bits/std_cctype.h 	shadow/bits/std_cerrno.h shadow/bits/std_cfloat.h 	shadow/bits/std_climits.h shadow/bits/std_clocale.h 	shadow/bits/std_cmath.h shadow/bits/std_csetjmp.h 	shadow/bits/std_csignal.h shadow/bits/std_cstdarg.h 	shadow/bits/std_cstddef.h shadow/bits/std_cstdio.h 	shadow/bits/std_cstdlib.h shadow/bits/std_cstring.h 	shadow/bits/std_ctime.h shadow/bits/std_cwchar.h 	shadow/bits/std_cwctype.h 	shadow/bits/wrap_libio.h shadow/bits/wrap_unistd.h 	shadow/sys/cdefs.h 
+headers =  	bits/cpp_type_traits.h 	bits/std_cctype.h bits/ctype_base.h bits/ctype_specializations.h 	bits/char_traits.h bits/codecvt.h 	bits/basic_string.h bits/std_string.h  bits/string.tcc 	bits/generic_shadow.h bits/std_utility.h 	bits/std_complex.h 	bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h 	bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h 	bits/gslice.h bits/gslice_array.h bits/indirect_array.h 	bits/std_cassert.h bits/std_cwctype.h 	bits/std_cerrno.h bits/std_cfloat.h bits/std_climits.h 	bits/std_clocale.h bits/std_cmath.h 	bits/std_csetjmp.h bits/std_csignal.h bits/std_cstdarg.h 	bits/std_cstddef.h bits/std_cstdio.h bits/std_cstdlib.h 	bits/std_cstring.h bits/std_ctime.h bits/std_cwchar.h 	bits/std_typeinfo.h bits/std_new.h 	bits/std_exception.h bits/exception_support.h 	bits/std_fstream.h bits/std_iomanip.h 	bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc 	bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h 	bits/std_istream.h bits/istream.tcc bits/std_locale.h 	bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc 	bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h 	bits/streambuf.tcc bits/basic_file.h 	bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h 	bits/stl_pthread_alloc.h bits/pthread_allocimpl.h 	bits/stl_threads.h bits/stl_iterator_base.h 	backward/algo.h backward/algobase.h backward/alloc.h 	backward/bvector.h backward/defalloc.h backward/deque.h 	backward/function.h backward/hash_map.h backward/hash_set.h 	backward/hashtable.h backward/heap.h backward/iterator.h 	backward/list.h backward/map.h backward/multimap.h backward/new.h 	backward/multiset.h backward/pair.h backward/iostream.h 	backward/rope.h backward/set.h backward/slist.h backward/stack.h 	backward/tempbuf.h backward/tree.h backward/vector.h 	bits/std_bitset.h bits/std_deque.h bits/std_functional.h 	bits/std_iterator.h bits/std_list.h 	bits/std_map.h bits/std_memory.h bits/std_numeric.h 	bits/std_queue.h bits/std_set.h bits/std_stack.h 	bits/std_stdexcept.h bits/std_vector.h 	bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h 	bits/stl_deque.h bits/stl_function.h 	bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h 	bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h 	bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h 	bits/stl_relops.h bits/stl_set.h 	bits/stl_stack.h bits/stl_string_fwd.h bits/stl_tempbuf.h 	bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h 	bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h 	bits/concept_checks.h bits/container_concepts.h 	bits/sequence_concepts.h bits/std_strstream.h 	ext/ropeimpl.h ext/stl_rope.h 	ext/stl_bvector.h bits/stl_config.h bits/stl_construct.h 	ext/stl_hashtable.h ext/stl_hash_fun.h 	ext/hash_map ext/hash_set ext/rope ext/slist 	ext/tree ext/bvector 	shadow/assert.h shadow/ctype.h shadow/errno.h shadow/float.h 	shadow/libio.h 	shadow/limits.h shadow/locale.h shadow/math.h shadow/setjmp.h 	shadow/signal.h shadow/stdarg.h shadow/stddef.h shadow/stdio.h 	shadow/stdlib.h shadow/string.h shadow/time.h 	shadow/unistd.h shadow/wchar.h shadow/wctype.h 	shadow/bits/std_cassert.h shadow/bits/std_cctype.h 	shadow/bits/std_cerrno.h shadow/bits/std_cfloat.h 	shadow/bits/std_climits.h shadow/bits/std_clocale.h 	shadow/bits/std_cmath.h shadow/bits/std_csetjmp.h 	shadow/bits/std_csignal.h shadow/bits/std_cstdarg.h 	shadow/bits/std_cstddef.h shadow/bits/std_cstdio.h 	shadow/bits/std_cstdlib.h shadow/bits/std_cstring.h 	shadow/bits/std_ctime.h shadow/bits/std_cwchar.h 	shadow/bits/std_cwctype.h 	shadow/bits/wrap_libio.h shadow/bits/wrap_unistd.h 	shadow/sys/cdefs.h 
 
 
 std_headers =  	algorithm bitset cassert cctype cerrno cfloat climits clocale ciso646 	cmath complex csetjmp csignal cstdarg cstddef cstdio cstdlib 	cstring ctime cwchar cwctype deque exception fstream functional 	iomanip ios iosfwd iostream istream iterator limits list locale 	map memory new numeric ostream queue set sstream stack stdexcept 	streambuf string strstream typeinfo utility valarray vector 
@@ -175,7 +173,7 @@ generated_headers =  	 $(top_builddir)/bits/std_limits.h $(top_builddir)/bits/c+
 cpu_headers =  	 $(top_srcdir)/@cpu_include_dir@/bits/atomicity.h 
 
 
-sources =  	limitsMEMBERS.cc 	cmath.cc 	complex.cc complexf.cc complexl.cc complex_io.cc 	stdexcept.cc 	c++io.cc ios.cc stdstreams.cc strstream.cc 	locale.cc localename.cc  	locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
+sources =  	limitsMEMBERS.cc 	cmath.cc 	complex.cc complexf.cc complexl.cc complex_io.cc 	stdexcept.cc 	c++io.cc ios.cc stdstreams.cc strstream.cc 	locale.cc localename.cc codecvt.cc 	locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
 
 
 wstring_sources =  	wstring-inst.cc
@@ -221,8 +219,8 @@ libinst_wstring_la_LIBADD =
 libinst_wstring_la_OBJECTS =  wstring-inst.lo
 libstdc___la_OBJECTS =  limitsMEMBERS.lo cmath.lo complex.lo complexf.lo \
 complexl.lo complex_io.lo stdexcept.lo c++io.lo ios.lo stdstreams.lo \
-strstream.lo locale.lo localename.lo locale-inst.lo stl-inst.lo \
-misc-inst.lo valarray-inst.lo string-inst.lo
+strstream.lo locale.lo localename.lo codecvt.lo locale-inst.lo \
+stl-inst.lo misc-inst.lo valarray-inst.lo string-inst.lo
 CXXFLAGS = @CXXFLAGS@
 CXXLD = $(CXX)
 CFLAGS = @CFLAGS@