aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@cygnus.com>2000-09-01 22:02:49 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2000-09-01 22:02:49 +0000
commit0435a3f8cab27de41051b3a9e0fe9fa110db6c5d (patch)
treecefbe2538d736581d78e2e53109a08c1f60975d5
parent8a09bb272cdab13ffe5376ea9d4a9d7c47816214 (diff)
downloadgcc-0435a3f8cab27de41051b3a9e0fe9fa110db6c5d.zip
gcc-0435a3f8cab27de41051b3a9e0fe9fa110db6c5d.tar.gz
gcc-0435a3f8cab27de41051b3a9e0fe9fa110db6c5d.tar.bz2
locale-inst.cc: Remove pre-instantiation of unicode codecvt types.
2000-09-01 Benjamin Kosnik <bkoz@cygnus.com> * src/locale-inst.cc: Remove pre-instantiation of unicode codecvt types. Now unnecessary, as locale header now correct. From-SVN: r36105
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/src/locale-inst.cc22
2 files changed, 5 insertions, 22 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ce44272..5f5e3d8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-01 Benjamin Kosnik <bkoz@cygnus.com>
+
+ * src/locale-inst.cc: Remove pre-instantiation of unicode
+ codecvt types. Now unnecessary, as locale header now correct.
+
2000-08-31 Benjamin Kosnik <bkoz@cygnus.com>
* bits/locale_facets.tcc (_S_build_float_format): Move ...
diff --git a/libstdc++-v3/src/locale-inst.cc b/libstdc++-v3/src/locale-inst.cc
index 20ff88d..3b8b981 100644
--- a/libstdc++-v3/src/locale-inst.cc
+++ b/libstdc++-v3/src/locale-inst.cc
@@ -131,28 +131,6 @@ namespace std {
// codecvt
template class __codecvt_abstract_base<char, char, mbstate_t>;
template class __codecvt_abstract_base<wchar_t, char, mbstate_t>;
-#ifdef _GLIBCPP_USE_WCHAR_T
- // XXX This should not be necessary. Unfortunately, the has_facet
- // and use_facet defines are not in the headers, an instead in
- // locale_facets.tcc for the time being, as they use std::vector and
- // thus compile time double when they are pushed up to the top-level
- // includes.
- typedef unsigned short unicode_t;
-
- template
- const codecvt<unicode_t, char, __enc_traits>&
- use_facet<codecvt<unicode_t, char, __enc_traits> >(const locale&);
- template
- bool
- has_facet<codecvt<unicode_t, char, __enc_traits> >(const locale &);
-
- template
- const codecvt<unicode_t, wchar_t, __enc_traits>&
- use_facet<codecvt<unicode_t, wchar_t, __enc_traits> >(const locale&);
- template
- bool
- has_facet<codecvt<unicode_t, wchar_t, __enc_traits> >(const locale &);
-#endif
// collate
template class _Collate<char>;