diff options
| author | Andrew Pinski <andrew_pinski@playstation.sony.com> | 2008-10-01 23:16:19 +0000 |
|---|---|---|
| committer | Andrew Pinski <pinskia@gcc.gnu.org> | 2008-10-01 16:16:19 -0700 |
| commit | ffecec4dce4ee13847608c404695527369e4120f (patch) | |
| tree | f1cab52b87004a944c65935e308ade3585c68dc3 /libstdc++-v3 | |
| parent | 3e93b2755219dbd75fda52a0300c3073a2c7f177 (diff) | |
| download | gcc-ffecec4dce4ee13847608c404695527369e4120f.zip gcc-ffecec4dce4ee13847608c404695527369e4120f.tar.gz gcc-ffecec4dce4ee13847608c404695527369e4120f.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/generic/c_locale.cc | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2ca3b9e..b6d6122 100644 --- 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 67efd9e..97e77d5 100644 --- 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(); |