This macro is defined in several palces, and we only fixed the
incorrect value in some of those places.
* include/std/algorithm (__cpp_lib_parallel_algorithm): Fix value.
* include/std/memory (__cpp_lib_parallel_algorithm): Likewise.
* include/std/numeric (__cpp_lib_parallel_algorithm): Likewise.
* testsuite/25_algorithms/pstl/feature_test.cc: New test.
Tested x86_64-linux, committed to trunk.
I'll backport this to gcc-9-branch too.
commit d51263b41ffa37d0650dd88162093e57fc03c41d
Author: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed Jun 12 20:16:03 2019 +0000
Fix incorrect __cpp_lib_parallel_algorithm macro definitions
* include/std/algorithm (__cpp_lib_parallel_algorithm): Fix value.
* include/std/memory (__cpp_lib_parallel_algorithm): Likewise.
* include/std/numeric (__cpp_lib_parallel_algorithm): Likewise.
* testsuite/25_algorithms/pstl/feature_test.cc: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@272216
138bc75d-0d04-0410-961f-82ee72b054a4
diff --git a/libstdc++-v3/include/std/algorithm
b/libstdc++-v3/include/std/algorithm
index 18182965fb1..124342c63f0 100644
--- a/libstdc++-v3/include/std/algorithm
+++ b/libstdc++-v3/include/std/algorithm
@@ -73,7 +73,7 @@
# endif
// Feature test macro for parallel algorithms
-# define __cpp_lib_parallel_algorithm 201703L
+# define __cpp_lib_parallel_algorithm 201603L
#endif // C++17
#ifdef _GLIBCXX_PARALLEL
diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory
index 1fb4a5f956c..3660f4d86de 100644
--- a/libstdc++-v3/include/std/memory
+++ b/libstdc++-v3/include/std/memory
@@ -407,7 +407,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
# endif
// Feature test macro for parallel algorithms
-# define __cpp_lib_parallel_algorithm 201703L
+# define __cpp_lib_parallel_algorithm 201603L
#endif // C++17
#endif /* _GLIBCXX_MEMORY */
diff --git a/libstdc++-v3/include/std/numeric b/libstdc++-v3/include/std/numeric
index def1debf754..01e3ae8e35d 100644
--- a/libstdc++-v3/include/std/numeric
+++ b/libstdc++-v3/include/std/numeric
@@ -216,7 +216,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
# endif
// Feature test macro for parallel algorithms
-# define __cpp_lib_parallel_algorithm 201703L
+# define __cpp_lib_parallel_algorithm 201603L
#endif // C++17
#endif /* _GLIBCXX_NUMERIC */
diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc
new file mode 100644
index 00000000000..e2ae11b5438
--- /dev/null
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc
@@ -0,0 +1,50 @@
+// Copyright (C) 2019 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/>.
+
+// { dg-options "-std=gnu++17" }
+// { dg-do preprocess { target c++17 } }
+
+#include <algorithm>
+#ifndef __cpp_lib_parallel_algorithm
+# error "Feature-test macro for parallel algorithms missing"
+#elif __cpp_lib_parallel_algorithm != 201603L
+# error "Feature-test macro for parallel algorithms has wrong value in
<algorithm>"
+#endif
+
+#include <numeric>
+#if __cpp_lib_parallel_algorithm != 201603L
+# error "Feature-test macro for parallel algorithms has wrong value in
<numeric>"
+#endif
+
+#include <version>
+#if __cpp_lib_parallel_algorithm != 201603L
+# error "Feature-test macro for parallel algorithms has wrong value in
<version>"
+#endif
+
+// The N4810 draft does not require the macro to be defined in <execution>.
+#include <memory>
+#if __cpp_lib_parallel_algorithm != 201603L
+# error "Feature-test macro for parallel algorithms has wrong value in
<memory>"
+#endif
+
+// The N4810 draft does not require the macro to be defined in <execution>.
+// Include this last, because it will trigger the inclusion of TBB headers,
+// which then include <memory>, so we need to have already checked <memory>.
+#include <execution>
+#if __cpp_lib_parallel_algorithm != 201603L
+# error "Feature-test macro for parallel algorithms has wrong value in
<execution>"
+#endif
