From 375d59849a2773e926ce26de006247d6f0a9490d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 29 Jan 2019 01:49:36 +0000 Subject: [PATCH] Fix tests for complex overloads of std::arg and std::proj The test for the synopsis of incorrectly adds constexpr to two functions in C++2a mode, but the C++2a draft and the header do not declare them constexpr. * testsuite/26_numerics/headers/complex/synopsis.cc: Remove incorrect constexpr specifiers from arg and proj. From-SVN: r268359 --- libstdc++-v3/ChangeLog | 3 +++ .../testsuite/26_numerics/headers/complex/synopsis.cc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1d47e86ccd3..078a4ae7154 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2019-01-29 Jonathan Wakely + * testsuite/26_numerics/headers/complex/synopsis.cc: Remove incorrect + constexpr specifiers from arg and proj. + * config/abi/pre/gnu.ver (GLIBCXX_3.4.26): Add missing exports for __shared_ptr instantiations used by gcc4-compatible ABI. diff --git a/libstdc++-v3/testsuite/26_numerics/headers/complex/synopsis.cc b/libstdc++-v3/testsuite/26_numerics/headers/complex/synopsis.cc index 3a22625c9d3..11307d194c0 100644 --- a/libstdc++-v3/testsuite/26_numerics/headers/complex/synopsis.cc +++ b/libstdc++-v3/testsuite/26_numerics/headers/complex/synopsis.cc @@ -89,10 +89,10 @@ namespace std { template _GLIBCXX_CONSTEXPR T real(const complex&); template _GLIBCXX_CONSTEXPR T imag(const complex&); template T abs(const complex&); - template _GLIBCXX20_CONSTEXPR T arg(const complex&); + template T arg(const complex&); template _GLIBCXX20_CONSTEXPR T norm(const complex&); template _GLIBCXX20_CONSTEXPR complex conj(const complex&); - template _GLIBCXX20_CONSTEXPR complex proj(const complex&); + template complex proj(const complex&); template complex polar(const T& rho, const T& theta); // 26.2.8 transcendentals: -- 2.30.2