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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 73d5b1c460e25016b9683d84e2e3aca758b055f6..bfc1ae7fe59b63694323546333c4628c7c444146 100644 (file)
--- 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 b30346203b163651d49d582b29966320b38e6ca5..118dc2b49aaa7579eefd314ee7abd17caf147993 100644 (file)
--- 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 (file)
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);
+}