aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2019-10-04 13:16:56 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2019-10-04 13:16:56 +0100
commit8384956a1b27161775bc0e272614c42e523ee8f6 (patch)
tree7c185043d90f32929e3c542b5fb010f36de42634
parent2e82a4615abc70d4ab75f15948d3396728822dfa (diff)
downloadgcc-8384956a1b27161775bc0e272614c42e523ee8f6.zip
gcc-8384956a1b27161775bc0e272614c42e523ee8f6.tar.gz
gcc-8384956a1b27161775bc0e272614c42e523ee8f6.tar.bz2
Add <span> to <bits/stdc++.h> precompiled header
* include/precompiled/stdc++.h: Include <span> for C++20. * testsuite/17_intro/names.cc: Do not define 'e' for C++20. From-SVN: r276574
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/precompiled/stdc++.h2
-rw-r--r--libstdc++-v3/testsuite/17_intro/names.cc3
3 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7beb037..0076d95 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-04 Jonathan Wakely <jwakely@redhat.com>
+
+ * include/precompiled/stdc++.h: Include <span> for C++20.
+ * testsuite/17_intro/names.cc: Do not define 'e' for C++20.
+
2019-10-03 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* include/parallel/multiway_merge.h (_RAIter3): Replace _C by _Cp.
diff --git a/libstdc++-v3/include/precompiled/stdc++.h b/libstdc++-v3/include/precompiled/stdc++.h
index d62f64b..4b668fd 100644
--- a/libstdc++-v3/include/precompiled/stdc++.h
+++ b/libstdc++-v3/include/precompiled/stdc++.h
@@ -139,7 +139,7 @@
// #include <concepts>
#include <numbers>
// #include <ranges>
-// #include <span>
+#include <span>
// #include <syncstream>
#include <version>
#endif
diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index cab2549..3d6148f 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -53,7 +53,10 @@
#endif
// <queue> and <stack> defined data members called c
#define d (
+#if __cplusplus <= 201703L
+// <numbers> defines std::numbers::e
#define e (
+#endif
#define f (
#define g (
#if __cplusplus >= 201402L