aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2002-02-07 20:28:55 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2002-02-07 20:28:55 +0000
commit3ab57fab23a0e65a4acbee0aac497b92ec8cb9f8 (patch)
tree80b9adcaa8527a1ff92f5ccfc8d7247f3393e1ce
parentd5614afb57da11705ce88e6646bcd33ef67eb8ab (diff)
downloadgcc-3ab57fab23a0e65a4acbee0aac497b92ec8cb9f8.zip
gcc-3ab57fab23a0e65a4acbee0aac497b92ec8cb9f8.tar.gz
gcc-3ab57fab23a0e65a4acbee0aac497b92ec8cb9f8.tar.bz2
basic_ios.tcc (basic_ios::narrow): Add default value.
2002-02-07 Benjamin Kosnik <bkoz@redhat.com> Wolfgang Bangerth <wolfgang.bangerth@iwr.uni-heidelberg.de> * include/bits/basic_ios.tcc (basic_ios::narrow): Add default value. (basic_ios::widen): Same. Co-Authored-By: Wolfgang Bangerth <wolfgang.bangerth@iwr.uni-heidelberg.de> From-SVN: r49590
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/bits/basic_ios.tcc4
2 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f384f07..d38dca4 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-07 Benjamin Kosnik <bkoz@redhat.com>
+ Wolfgang Bangerth <wolfgang.bangerth@iwr.uni-heidelberg.de>
+
+ * include/bits/basic_ios.tcc (basic_ios::narrow): Add default value.
+ (basic_ios::widen): Same.
+
2002-02-07 Paolo Carlini <pcarlini@unitus.it>
* testsuite/22_locale/money_get_members_char.cc:
diff --git a/libstdc++-v3/include/bits/basic_ios.tcc b/libstdc++-v3/include/bits/basic_ios.tcc
index d1f5d19..dd4329f 100644
--- a/libstdc++-v3/include/bits/basic_ios.tcc
+++ b/libstdc++-v3/include/bits/basic_ios.tcc
@@ -92,7 +92,7 @@ namespace std
char
basic_ios<_CharT, _Traits>::narrow(char_type __c, char __dfault) const
{
- char __ret;
+ char __ret = __dfault;
if (_M_check_facet(_M_ios_fctype))
__ret = _M_ios_fctype->narrow(__c, __dfault);
return __ret;
@@ -102,7 +102,7 @@ namespace std
_CharT
basic_ios<_CharT, _Traits>::widen(char __c) const
{
- char_type __ret;
+ char_type __ret = char_type();
if (_M_check_facet(_M_ios_fctype))
__ret = _M_ios_fctype->widen(__c);
return __ret;