2007-02-13 Dirk Mueller <dmueller@suse.de>

       * include/bits/locale_facets.tcc (num_get<>::do_get): Avoid
       warning about ambiguous else.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121881 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cd928ef..586c622 100644 (file)
--- 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 (file)
--- 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;