c_locale.cc (__convert_to_v): Fix !__FLT_HAS_INFINITY__ case.

2008-10-01  Andrew Pinski  <andrew_pinski@playstation.sony.com>

        * config/locale/generic/c_locale.cc (__convert_to_v): Fix
        !__FLT_HAS_INFINITY__ case.

From-SVN: r140823

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2ca3b9e0908ede176df6e199d5a6c122316237e5..b6d612206300f3f486c0c3839a153a7b82c58f7f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-01  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+       * config/locale/generic/c_locale.cc (__convert_to_v): Fix
+       !__FLT_HAS_INFINITY__ case.
+
 2008-09-30  Chris Fairles  <cfairles@gcc.gnu.org>
 
        * include/std/tuple (tuple<>::swap): Implement swap for tuple as per 

diff --git a/libstdc++-v3/config/locale/generic/c_locale.cc b/libstdc++-v3/config/locale/generic/c_locale.cc
index 67efd9e850f4e6f907e3be850ab6a29d281fffb0..97e77d57aa0c3c07f43799c9545eb61211919837 100644 (file)
--- a/libstdc++-v3/config/locale/generic/c_locale.cc
+++ b/libstdc++-v3/config/locale/generic/c_locale.cc
@@ -97,10 +97,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       else if (__overflow
 #if __FLT_HAS_INFINITY__
               || __v == numeric_limits<float>::infinity()
-              || __v == -numeric_limits<float>::infinity())
+              || __v == -numeric_limits<float>::infinity()
 #else
               || ((__v > 1.0f || __v < -1.0f) && errno == ERANGE)
 #endif
+             )
        {
          if (__v > 0.0f)
            __v = numeric_limits<float>::max();