From: Jan Beulich <jbeulich@novell.com>
Date: Thu, 12 Aug 2004 09:46:39 +0000 (+0000)
Subject: 2004-08-12  Jan Beulich  <jbeulich@novell.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=03a2b8100f3f3c3ab61da05e5c43f6c538f4f58a;p=gcc.git

2004-08-12  Jan Beulich  <jbeulich@novell.com>

	* config/locale/generic/ctype_members.cc
	(ctype<wchar_t>::_M_convert_to_wmask): Default case must not use 0 as
	initializer for return value, as that is invalid for enumerated	types.
	* config/locale/gnu/ctype_members.cc
	(ctype<wchar_t>::_M_convert_to_wmask): Likewise.

From-SVN: r85862
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 616ed13d3ef..b57e2f00c6c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-12  Jan Beulich  <jbeulich@novell.com>
+
+	* config/locale/generic/ctype_members.cc
+	(ctype<wchar_t>::_M_convert_to_wmask): Default case must not use 0 as
+	initializer for return value, as that is invalid for enumerated	types.
+	* config/locale/gnu/ctype_members.cc
+	(ctype<wchar_t>::_M_convert_to_wmask): Likewise.
+
 2004-08-11  Paolo Carlini  <pcarlini@suse.de>
 
 	* testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc: Fix typo.
diff --git a/libstdc++-v3/config/locale/generic/ctype_members.cc b/libstdc++-v3/config/locale/generic/ctype_members.cc
index af994cbf46a..835802080b6 100644
--- a/libstdc++-v3/config/locale/generic/ctype_members.cc
+++ b/libstdc++-v3/config/locale/generic/ctype_members.cc
@@ -91,7 +91,7 @@ namespace std
 	__ret = wctype("graph");
 	break;
       default:
-	__ret = 0;
+	__ret = __wmask_type();
       }
     return __ret;
   };
diff --git a/libstdc++-v3/config/locale/gnu/ctype_members.cc b/libstdc++-v3/config/locale/gnu/ctype_members.cc
index 7c53c15831d..fcb0551b382 100644
--- a/libstdc++-v3/config/locale/gnu/ctype_members.cc
+++ b/libstdc++-v3/config/locale/gnu/ctype_members.cc
@@ -95,7 +95,7 @@ namespace std
 	__ret = __wctype_l("graph", _M_c_locale_ctype);
 	break;
       default:
-	__ret = 0;
+	__ret = __wmask_type();
       }
     return __ret;
   }