diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8377536456c77c6ec313c161b8798f4f26ae21a1..7668e70bfb7a81b59691d6f4065eda747b90cae9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2004-03-11 Paolo Carlini <pcarlini@suse.de> + + * include/std/std_complex.h (pow(const complex&, const _Tp&), + pow(const _Tp&, const complex&), pow(const complex&, + const complex&)): Fully qualify with std:: a few calls. + * testsuite/26_numerics/complex/13450.cc: Minor tweak. + 2004-03-11 Steven Bosscher <s.bosscher@student.tudelft.nl> PR libstdc++/11706 diff --git a/libstdc++-v3/include/std/std_complex.h b/libstdc++-v3/include/std/std_complex.h index d997867c58865757d64248ae7d7e06169b6eea22..e1027f65991f5ee355a9813debe7acb7a9666659 100644 --- a/libstdc++-v3/include/std/std_complex.h +++ b/libstdc++-v3/include/std/std_complex.h @@ -708,7 +708,7 @@ namespace std if (__x.imag() == _Tp() && __x.real() > _Tp()) return pow(__x.real(), __y); - complex<_Tp> __t = log(__x); + complex<_Tp> __t = std::log(__x); return std::polar(exp(__y * __t.real()), __y * __t.imag()); } @@ -716,15 +716,16 @@ namespace std inline complex<_Tp> pow(const complex<_Tp>& __x, const complex<_Tp>& __y) { - return __x == _Tp() ? _Tp() : exp(__y * log(__x)); + return __x == _Tp() ? _Tp() : std::exp(__y * std::log(__x)); } template<typename _Tp> inline complex<_Tp> pow(const _Tp& __x, const complex<_Tp>& __y) { - return __x > _Tp() ? polar(pow(__x, __y.real()), __y.imag() * log(__x)) - : pow(complex<_Tp>(__x, _Tp()), __y); + return __x > _Tp() ? std::polar(pow(__x, __y.real()), + __y.imag() * log(__x)) + : std::pow(complex<_Tp>(__x, _Tp()), __y); } // 26.2.3 complex specializations diff --git a/libstdc++-v3/testsuite/26_numerics/complex/13450.cc b/libstdc++-v3/testsuite/26_numerics/complex/13450.cc index 9df257db599de08869ac3edea9430014a680b628..50f4bad3b93e1821c2f17a7e7146a6770115dc5d 100644 --- a/libstdc++-v3/testsuite/26_numerics/complex/13450.cc +++ b/libstdc++-v3/testsuite/26_numerics/complex/13450.cc @@ -29,7 +29,7 @@ template<typename T> bool test __attribute__((unused)) = true; typedef complex<T> cplx; - T eps = numeric_limits<T>::epsilon() * 10; + T eps = numeric_limits<T>::epsilon() * 100; cplx ref = pow(cplx(a, T()), cplx(b, T())); cplx res1 = pow(a, cplx(b, T()));