From b98fcf6ecd5693f7b341bf419c5ef72b4647c304 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 2 Mar 2012 22:24:45 +0000 Subject: [PATCH] limits (numeric_limits): Fix returns per C++11. 2012-03-02 Paolo Carlini * include/std/limits (numeric_limits): Fix returns per C++11. * testsuite/18_support/numeric_limits/primary.cc: New. From-SVN: r184837 --- libstdc++-v3/ChangeLog | 5 ++++ libstdc++-v3/include/std/limits | 18 +++++++------- .../18_support/numeric_limits/primary.cc | 24 +++++++++++++++++++ 3 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 libstdc++-v3/testsuite/18_support/numeric_limits/primary.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d49c6a4bdf4..3abfc9435af 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2012-03-02 Paolo Carlini + + * include/std/limits (numeric_limits): Fix returns per C++11. + * testsuite/18_support/numeric_limits/primary.cc: New. + 2012-03-02 Benjamin Kosnik * include/c_global/cstdio: Remove extraneous extern. diff --git a/libstdc++-v3/include/std/limits b/libstdc++-v3/include/std/limits index ea37d9d20cd..e7a6e8fa934 100644 --- a/libstdc++-v3/include/std/limits +++ b/libstdc++-v3/include/std/limits @@ -306,47 +306,47 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** The minimum finite value, or for floating types with denormalization, the minimum positive normalized value. */ static _GLIBCXX_CONSTEXPR _Tp - min() _GLIBCXX_USE_NOEXCEPT { return static_cast<_Tp>(0); } + min() _GLIBCXX_USE_NOEXCEPT { return _Tp(); } /** The maximum finite value. */ static _GLIBCXX_CONSTEXPR _Tp - max() _GLIBCXX_USE_NOEXCEPT { return static_cast<_Tp>(0); } + max() _GLIBCXX_USE_NOEXCEPT { return _Tp(); } #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** A finite value x such that there is no other finite value y * where y < x. */ static constexpr _Tp - lowest() noexcept { return static_cast<_Tp>(0); } + lowest() noexcept { return _Tp(); } #endif /** The @e machine @e epsilon: the difference between 1 and the least value greater than 1 that is representable. */ static _GLIBCXX_CONSTEXPR _Tp - epsilon() _GLIBCXX_USE_NOEXCEPT { return static_cast<_Tp>(0); } + epsilon() _GLIBCXX_USE_NOEXCEPT { return _Tp(); } /** The maximum rounding error measurement (see LIA-1). */ static _GLIBCXX_CONSTEXPR _Tp - round_error() _GLIBCXX_USE_NOEXCEPT { return static_cast<_Tp>(0); } + round_error() _GLIBCXX_USE_NOEXCEPT { return _Tp(); } /** The representation of positive infinity, if @c has_infinity. */ static _GLIBCXX_CONSTEXPR _Tp - infinity() _GLIBCXX_USE_NOEXCEPT { return static_cast<_Tp>(0); } + infinity() _GLIBCXX_USE_NOEXCEPT { return _Tp(); } /** The representation of a quiet Not a Number, if @c has_quiet_NaN. */ static _GLIBCXX_CONSTEXPR _Tp - quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return static_cast<_Tp>(0); } + quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return _Tp(); } /** The representation of a signaling Not a Number, if @c has_signaling_NaN. */ static _GLIBCXX_CONSTEXPR _Tp - signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return static_cast<_Tp>(0); } + signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return _Tp(); } /** The minimum positive denormalized value. For types where @c has_denorm is false, this is the minimum positive normalized value. */ static _GLIBCXX_CONSTEXPR _Tp - denorm_min() _GLIBCXX_USE_NOEXCEPT { return static_cast<_Tp>(0); } + denorm_min() _GLIBCXX_USE_NOEXCEPT { return _Tp(); } }; #ifdef __GXX_EXPERIMENTAL_CXX0X__ diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/primary.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/primary.cc new file mode 100644 index 00000000000..833b27a8f53 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/numeric_limits/primary.cc @@ -0,0 +1,24 @@ +// { dg-do compile } + +// Copyright (C) 2012 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +struct MyBigNum { }; + +template class std::numeric_limits;