From d7988f9165cd8bafbd295ef30d2fd595c58599ac Mon Sep 17 00:00:00 2001 From: paolo Date: Thu, 8 Nov 2007 02:48:25 +0000 Subject: [PATCH] 2007-11-07 Paolo Carlini * include/tr1_impl/complex (fabs): In C++0x mode adjust return type per DR 595 [Ready]. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129983 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/tr1_impl/complex | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 78e5b2a..fd48059 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2007-11-07 Paolo Carlini + * include/tr1_impl/complex (fabs): In C++0x mode adjust + return type per DR 595 [Ready]. + +2007-11-07 Paolo Carlini + * include/bits/stl_iterator.h (move_iterator<>::pointer): Adjust typedef per DR 680 [Ready]. diff --git a/libstdc++-v3/include/tr1_impl/complex b/libstdc++-v3/include/tr1_impl/complex index f763182..5c25cae 100644 --- a/libstdc++-v3/include/tr1_impl/complex +++ b/libstdc++-v3/include/tr1_impl/complex @@ -44,7 +44,12 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 template std::complex<_Tp> acosh(const std::complex<_Tp>&); template std::complex<_Tp> asinh(const std::complex<_Tp>&); template std::complex<_Tp> atanh(const std::complex<_Tp>&); +#ifdef _GLIBCXX_INCLUDE_AS_CXX0X + // DR 595. + template _Tp fabs(const std::complex<_Tp>&); +#else template std::complex<_Tp> fabs(const std::complex<_Tp>&); +#endif /// @brief acos(__z) [8.1.2]. // Effects: Behaves the same as C99 function cacos, defined @@ -288,7 +293,11 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 // Effects: Behaves the same as C99 function cabs, defined // in subclause 7.3.8.1. template +#ifdef _GLIBCXX_INCLUDE_AS_CXX0X + inline _Tp +#else inline std::complex<_Tp> +#endif fabs(const std::complex<_Tp>& __z) { return std::abs(__z); } -- 2.7.4