Thought I should probably clean this up before closing off the PR.
Regtested on x86_64-pc-linux-gnu with no regressions, OK for trunk?
-- >8 --
The modules bug requiring this workaround was fixed with commit
r15-4862-g815e48e3d42231.
PR testsuite/113710
PR c++/113814
libstdc++-v3/ChangeLog:
* include/bits/stl_pair.h: Remove workaround.
Signed-off-by: Nathaniel Shead <[email protected]>
---
libstdc++-v3/include/bits/stl_pair.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/libstdc++-v3/include/bits/stl_pair.h
b/libstdc++-v3/include/bits/stl_pair.h
index 0d60eaba194..e92fcad2d66 100644
--- a/libstdc++-v3/include/bits/stl_pair.h
+++ b/libstdc++-v3/include/bits/stl_pair.h
@@ -1183,11 +1183,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct tuple_element<1, pair<_Tp1, _Tp2>>
{ typedef _Tp2 type; };
- // Forward declare the partial specialization for std::tuple
- // to work around modules bug PR c++/113814.
- template<size_t __i, typename... _Types>
- struct tuple_element<__i, tuple<_Types...>>;
-
#if __cplusplus >= 201703L
template<typename _Tp1, typename _Tp2>
inline constexpr size_t tuple_size_v<pair<_Tp1, _Tp2>> = 2;
--
2.47.0
