summaryrefslogtreecommitdiff
path: root/libstdc++-v3/src/locale-inst.cc
diff options
context:
space:
mode:
authorbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2001-09-28 23:44:48 +0000
committerbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2001-09-28 23:44:48 +0000
commitba6690e379a82d6ff3829f201a3f9dea833d6052 (patch)
tree684e546d2b29fa36fbd78496cc7dfc2128b47c0c /libstdc++-v3/src/locale-inst.cc
parentf9fb3b68bc19520741acbdb2fa69188b6f4afee3 (diff)
downloadgcc-ba6690e379a82d6ff3829f201a3f9dea833d6052.tar.gz
2001-09-28 Benjamin Kosnik <bkoz@redhat.com>
* config/locale/time_members_gnu.h (__timepunct::_M_get_helper): Add. (__timepunct::_M_put_helper): Add. * config/locale/time_members_generic.h: Same. * include/bits/locale_facets.h (__match_parallel): Remove. Format. (__timepunct): Add data members. (__timepunct::_M_days): Add. (__timepunct::_M_days_abbreviated): Add. (__timepunct::_M_months): Add. (__timepunct::_M_months_abbreviated): Add. (__timepunct::_M_initialize_timepunct): Add. * include/bits/locale_facets.tcc: Same. * src/locale-inst.cc: Remove instantiations for __match_parallel. * acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Add CTIME_CC. * aclocal.m4: Regenerate. * configure: Regenerate. * testsuite/22_locale/time_put_members_char.cc: Mark XFAIL. * testsuite/22_locale/time_put_members_char.cc (test01): New file. * testsuite/22_locale/time_get.cc: New file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45868 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src/locale-inst.cc')
-rw-r--r--libstdc++-v3/src/locale-inst.cc23
1 files changed, 3 insertions, 20 deletions
diff --git a/libstdc++-v3/src/locale-inst.cc b/libstdc++-v3/src/locale-inst.cc
index 7e60498cc49..ac072151f3f 100644
--- a/libstdc++-v3/src/locale-inst.cc
+++ b/libstdc++-v3/src/locale-inst.cc
@@ -122,13 +122,9 @@ namespace std
// collate
template class collate<char>;
template class collate_byname<char>;
- template class _Weekdaynames<char, int>;
- template class _Monthnames<char, int>;
#ifdef _GLIBCPP_USE_WCHAR_T
template class collate<wchar_t>;
template class collate_byname<wchar_t>;
- template class _Weekdaynames<wchar_t, int>;
- template class _Monthnames<wchar_t, int>;
#endif
// use_facet
@@ -243,30 +239,17 @@ namespace std
const vec_pfacet::value_type&);
+ //
+ // locale
+ //
typedef istreambuf_iterator<char, char_traits<char> > istreambuf_iter;
typedef ostreambuf_iterator<char, char_traits<char> > ostreambuf_iter;
-
- template
- istreambuf_iter
- __match_parallel<istreambuf_iter, char>
- (istreambuf_iter, istreambuf_iter, int, const string*, int*, int&, bool&);
-
-
#ifdef _GLIBCPP_USE_WCHAR_T
typedef istreambuf_iterator<wchar_t,char_traits<wchar_t> > wistreambuf_iter;
typedef ostreambuf_iterator<wchar_t,char_traits<wchar_t> > wostreambuf_iter;
-
- template
- wistreambuf_iter
- __match_parallel<wistreambuf_iter, wchar_t>
- (wistreambuf_iter, wistreambuf_iter, int, const wstring*, int*, int&, bool&);
#endif
-
- //
- // locale
- //
template
bool
locale::operator()(const string&, const string&) const;