diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-07 19:06:57 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-07 19:06:57 +0000 |
| commit | 4816a6cd67cade69533cdb106c34125da7fe2f3d (patch) | |
| tree | 0731b7d8c3a10350c7f339f76aef01ded4064321 | |
| parent | eb47fbe0425f293337f26ce2a7b76ed816806b42 (diff) | |
| download | gcc-4816a6cd67cade69533cdb106c34125da7fe2f3d.tar.gz | |
* config/locale/generic/messages_members.cc: Add specialization for
messages<wchar_t>.
* config/locale/ieee_1003.1-20021/messages_members.cc: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@56920 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/generic/messages_members.cc | 7 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc | 12 |
3 files changed, 25 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ba71fddb9aa..c6ee01407ee 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2002-09-07 Jakub Jelinek <jakub@redhat.com> + + * config/locale/generic/messages_members.cc: Add specialization for + messages<wchar_t>. + * config/locale/ieee_1003.1-20021/messages_members.cc: Likewise. + 2002-09-06 Benjamin Kosnik <bkoz@redhat.com> * include/bits/localefwd.h: Tweak formatting. diff --git a/libstdc++-v3/config/locale/generic/messages_members.cc b/libstdc++-v3/config/locale/generic/messages_members.cc index 480ab88d824..f38f82beed2 100644 --- a/libstdc++-v3/config/locale/generic/messages_members.cc +++ b/libstdc++-v3/config/locale/generic/messages_members.cc @@ -42,4 +42,11 @@ namespace std string messages<char>::do_get(catalog, int, int, const string& __dfault) const { return __dfault; } + +#ifdef _GLIBCPP_USE_WCHAR_T + template<> + wstring + messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const + { return __dfault; } +#endif } diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc b/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc index 0f667d6a4d0..aaf07a2342e 100644 --- a/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc +++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc @@ -46,4 +46,16 @@ namespace std nl_catd __nlc = reinterpret_cast<nl_catd>(__c); return string(catgets(__nlc, __setid, __msgid, __dfault.c_str())); } + +#ifdef _GLIBCPP_USE_WCHAR_T + template<> + wstring + messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const + { + nl_catd __nlc = reinterpret_cast<nl_catd>(__c); + char* __msg = catgets(__nlc, __setid, __msgid, + _M_convert_to_char(__dfault)); + return _M_convert_from_char(__msg); + } +#endif } |