diff options
| author | Edward Smith-Rowland <3dw4rd@verizon.net> | 2018-12-04 16:26:39 +0000 |
|---|---|---|
| committer | Edward Smith-Rowland <emsr@gcc.gnu.org> | 2018-12-04 16:26:39 +0000 |
| commit | d012ab6057968dd5235a64c03c2824ee6e80eea4 (patch) | |
| tree | 8c403e1b62033547450cdef5bb581038c40c7692 | |
| parent | e95ca1333dfa819dfcde579ec06cad7dac0a1d0b (diff) | |
| download | gcc-d012ab6057968dd5235a64c03c2824ee6e80eea4.zip gcc-d012ab6057968dd5235a64c03c2824ee6e80eea4.tar.gz gcc-d012ab6057968dd5235a64c03c2824ee6e80eea4.tar.bz2 | |
PR libstdc++/88341 - Complex norm doesn't compile with C++11
2018-12-03 Edward Smith-Rowland <3dw4rd@verizon.net>
PR libstdc++/88341 - Complex norm doesn't compile with C++11
* include/std/complex (_S_do_it): Make C++20 constexpr.
* testsuite/26_numerics/complex/value_operations/pr88341.cc: New test.
From-SVN: r266788
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/complex | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/26_numerics/complex/value_operations/pr88341.cc | 27 |
3 files changed, 35 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 73d5b1c..bfc1ae7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2018-12-03 Edward Smith-Rowland <3dw4rd@verizon.net> + + PR libstdc++/88341 - Complex norm doesn't compile with C++11 + * include/std/complex (_S_do_it): Make C++20 constexpr. + * testsuite/26_numerics/complex/value_operations/pr88341.cc: New test. + 2018-11-30 Edward Smith-Rowland <3dw4rd@verizon.net> Implement P0457R2 String Prefix and Suffix Checking. diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex index b303462..118dc2b 100644 --- a/libstdc++-v3/include/std/complex +++ b/libstdc++-v3/include/std/complex @@ -659,7 +659,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct _Norm_helper { template<typename _Tp> - static inline _GLIBCXX_CONSTEXPR _Tp _S_do_it(const complex<_Tp>& __z) + static inline _GLIBCXX20_CONSTEXPR _Tp _S_do_it(const complex<_Tp>& __z) { const _Tp __x = __z.real(); const _Tp __y = __z.imag(); @@ -671,7 +671,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct _Norm_helper<true> { template<typename _Tp> - static inline _GLIBCXX_CONSTEXPR _Tp _S_do_it(const complex<_Tp>& __z) + static inline _GLIBCXX20_CONSTEXPR _Tp _S_do_it(const complex<_Tp>& __z) { //_Tp __res = std::abs(__z); //return __res * __res; diff --git a/libstdc++-v3/testsuite/26_numerics/complex/value_operations/pr88341.cc b/libstdc++-v3/testsuite/26_numerics/complex/value_operations/pr88341.cc new file mode 100644 index 0000000..dc928af --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/complex/value_operations/pr88341.cc @@ -0,0 +1,27 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile { target c++11 } } + +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// 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 +// <http://www.gnu.org/licenses/>. + +#include <complex> + +double +n(std::complex<double>& c) +{ + return std::norm(c); +} |