https://gcc.gnu.org/g:45df071ace69b06fbb8dd047a001e16f63338320
commit 45df071ace69b06fbb8dd047a001e16f63338320
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Fri Jun 14 19:11:02 2019 +0100
Fix incorrect __cpp_lib_parallel_algorithm macro definitions
Backport from mainline
2019-06-12 Jonathan Wakely <jwakely@redhat.com>
* 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.
From-SVN: r272300
Diff:
---
libstdc++-v3/ChangeLog | 10 +++++
libstdc++-v3/include/std/algorithm | 2 +-
libstdc++-v3/include/std/memory | 2 +-
libstdc++-v3/include/std/numeric | 2 +-
.../testsuite/25_algorithms/pstl/feature_test.cc | 51 ++++++++++++++++++++++
5 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 93e39e9..fcf4880 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,6 +1,16 @@
2019-06-14 Jonathan Wakely <jwakely@redhat.com>
Backport from mainline
+ 2019-06-12 Jonathan Wakely <jwakely@redhat.com>
+
+ * 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.
+
+2019-06-14 Jonathan Wakely <jwakely@redhat.com>
+
+ Backport from mainline
2019-06-07 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/90770
diff --git a/libstdc++-v3/include/std/algorithm b/libstdc++-v3/include/std/algorithm
index 73c87d5..b5013a2 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 6677fe7..81e9ea3 100644
--- a/libstdc++-v3/include/std/memory
+++ b/libstdc++-v3/include/std/memory
@@ -376,7 +376,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 9dff247..3babfaa 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 0000000..d9d558b
--- /dev/null
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc
@@ -0,0 +1,51 @@
+// 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 } }
+// { dg-require-effective-target tbb-backend }
+
+#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