aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog8
-rw-r--r--libstdc++-v3/config/locale/generic/ctype_members.cc2
-rw-r--r--libstdc++-v3/config/locale/gnu/ctype_members.cc2
3 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 616ed13..b57e2f0 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 af994cb..8358020 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 7c53c15..fcb0551 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;
}