aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Mueller <dmueller@suse.de>2007-02-13 10:13:04 +0000
committerDirk Mueller <mueller@gcc.gnu.org>2007-02-13 10:13:04 +0000
commit9e0b7527bec629acac6c5854e854b16bd7bedca1 (patch)
tree4688079902aa1fe20f2bc603a19f040d6f17e290
parent7a23933bdd11a28c04098c1facb00059dd2be272 (diff)
downloadgcc-9e0b7527bec629acac6c5854e854b16bd7bedca1.zip
gcc-9e0b7527bec629acac6c5854e854b16bd7bedca1.tar.gz
gcc-9e0b7527bec629acac6c5854e854b16bd7bedca1.tar.bz2
locale_facets.tcc (num_get<>::do_get): Avoid warning about ambiguous else.
2007-02-13 Dirk Mueller <dmueller@suse.de> * include/bits/locale_facets.tcc (num_get<>::do_get): Avoid warning about ambiguous else. From-SVN: r121881
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/locale_facets.tcc20
2 files changed, 17 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cd928ef..586c622 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-13 Dirk Mueller <dmueller@suse.de>
+
+ * include/bits/locale_facets.tcc (num_get<>::do_get): Avoid
+ warning about ambiguous else.
+
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 80c0cc2..b6feda0 100644
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -746,16 +746,20 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
const char_type __c = *__beg;
if (__testf)
- if (__n < __lc->_M_falsename_size)
- __testf = __c == __lc->_M_falsename[__n];
- else
- break;
+ {
+ if (__n < __lc->_M_falsename_size)
+ __testf = __c == __lc->_M_falsename[__n];
+ else
+ break;
+ }
if (__testt)
- if (__n < __lc->_M_truename_size)
- __testt = __c == __lc->_M_truename[__n];
- else
- break;
+ {
+ if (__n < __lc->_M_truename_size)
+ __testt = __c == __lc->_M_truename[__n];
+ else
+ break;
+ }
if (!__testf && !__testt)
break;