From 8384956a1b27161775bc0e272614c42e523ee8f6 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 4 Oct 2019 13:16:56 +0100
Subject: [PATCH] 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
---
 libstdc++-v3/ChangeLog                    | 5 +++++
 libstdc++-v3/include/precompiled/stdc++.h | 2 +-
 libstdc++-v3/testsuite/17_intro/names.cc  | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7beb037110d..0076d95100b 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 d62f64b9f6e..4b668fddc03 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 cab25498043..3d6148fa0e8 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
-- 
2.30.2