messages_members.cc: Add specialization for messages<wchar_t>.

	* config/locale/generic/messages_members.cc: Add specialization for
	messages<wchar_t>.
	* config/locale/ieee_1003.1-20021/messages_members.cc: Likewise.

From-SVN: r56919

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fc4ffd14b02029625388ce433203888273a9c7eb..f8a26dec0691f655d9dd67e568c29fd17ff8fd23 100644 (file)
--- 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  Jakub Jelinek  <jakub@redhat.com>
 
        * configure.target: Use cpu_include_dir="config/cpu/sparc" for all

diff --git a/libstdc++-v3/config/locale/generic/messages_members.cc b/libstdc++-v3/config/locale/generic/messages_members.cc
index 480ab88d824155eadf1116f363c00e2ce644d5fe..f38f82beed2ff3906e8c82cea8431ebb18602b41 100644 (file)
--- 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 0f667d6a4d021395b04f3bab33ef2d579ebed70c..aaf07a2342ee68a31bf78ff5749ef3af2fb0ed9e 100644 (file)
--- 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
 }