From a043b1f5c90b437896c826c80244aa06e7fd2926 Mon Sep 17 00:00:00 2001 From: Jerry Quinn Date: Tue, 30 Dec 2003 03:09:17 +0000 Subject: [PATCH] locale_facets.h (ctype.narrow,widen): Add cast. 2003-12-29 Jerry Quinn * include/bits/locale_facets.h (ctype.narrow,widen): Add cast. From-SVN: r75222 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/include/bits/locale_facets.h | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 448c96671e1..5c8ca195a56 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2003-12-29 Jerry Quinn + + * include/bits/locale_facets.h (ctype.narrow,widen): Add cast. + 2003-12-29 Paolo Carlini * acinclude.m4 (GLIBCXX_CHECK_LFS): Add -fno-exceptions diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index eecb15c1b74..2d3f776b26f 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -878,7 +878,7 @@ namespace std char_type widen(char __c) const { - if (_M_widen_ok) return _M_widen[__c]; + if (_M_widen_ok) return _M_widen[static_cast(__c)]; this->_M_widen_init(); return this->do_widen(__c); } @@ -934,9 +934,10 @@ namespace std char narrow(char_type __c, char __dfault) const { - if (_M_narrow[__c]) return _M_narrow[__c]; + if (_M_narrow[static_cast(__c)]) + return _M_narrow[static_cast(__c)]; const char __t = do_narrow(__c, __dfault); - if (__t != __dfault) _M_narrow[__c] = __t; + if (__t != __dfault) _M_narrow[static_cast(__c)] = __t; return __t; }