public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r10-9048] libstdc++: Avoid CTAD for std::ranges::join_view [LWG 3474]
@ 2020-11-18 16:11 Patrick Palka
0 siblings, 0 replies; only message in thread
From: Patrick Palka @ 2020-11-18 16:11 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:175e6b47f268e871a4c84e006ed981ce048c4184
commit r10-9048-g175e6b47f268e871a4c84e006ed981ce048c4184
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Tue Oct 6 09:41:16 2020 +0100
libstdc++: Avoid CTAD for std::ranges::join_view [LWG 3474]
In commit ef275d1f2083f8a1fa1b59a3cd07fd3e8431023e I implemented the
wrong resolution of LWG 3474. This removes the deduction guide and
alters the views::join factory to create the right type explicitly.
libstdc++-v3/ChangeLog:
* include/std/ranges (join_view): Remove deduction guide.
(views::join): Add explicit template argument list to prevent
deducing the wrong type.
* testsuite/std/ranges/adaptors/join.cc: Move test for LWG 3474
here, from ...
* testsuite/std/ranges/adaptors/join_lwg3474.cc: Removed.
(cherry picked from commit 9065c4adab0b1280f5707d53833d195d0d350fd2)
Diff:
---
libstdc++-v3/include/std/ranges | 9 ++----
libstdc++-v3/testsuite/std/ranges/adaptors/join.cc | 16 ++++++++++
.../testsuite/std/ranges/adaptors/join_lwg3474.cc | 37 ----------------------
3 files changed, 19 insertions(+), 43 deletions(-)
diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index 23c54b2ae4e..5625b0ba1a3 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -2699,17 +2699,14 @@ namespace views
template<typename _Range>
explicit join_view(_Range&&) -> join_view<views::all_t<_Range>>;
- // _GLIBCXX_RESOLVE_LIB_DEFECTS
- // 3474. Nesting join_views is broken because of CTAD
- template<typename _View>
- explicit join_view(join_view<_View>) -> join_view<join_view<_View>>;
-
namespace views
{
inline constexpr __adaptor::_RangeAdaptorClosure join
= [] <viewable_range _Range> (_Range&& __r)
{
- return join_view{std::forward<_Range>(__r)};
+ // _GLIBCXX_RESOLVE_LIB_DEFECTS
+ // 3474. Nesting join_views is broken because of CTAD
+ return join_view<views::all_t<_Range>>{std::forward<_Range>(__r)};
};
} // namespace views
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc
index 142c9feddcd..e21e7054b35 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc
@@ -123,6 +123,21 @@ test06()
b = ranges::end(v);
}
+void
+test07()
+{
+ // LWG 3474. Nesting join_views is broken because of CTAD
+ std::vector<std::vector<std::vector<int>>> nested_vectors = {
+ {{1, 2, 3}, {4, 5}, {6}},
+ {{7}, {8, 9}, {10, 11, 12}},
+ {{13}}
+ };
+ auto joined = nested_vectors | std::views::join | std::views::join;
+
+ using V = decltype(joined);
+ static_assert( std::same_as<std::ranges::range_value_t<V>, int> );
+}
+
int
main()
{
@@ -132,4 +147,5 @@ main()
test04();
test05();
test06();
+ test07();
}
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join_lwg3474.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/join_lwg3474.cc
deleted file mode 100644
index 516aaba7070..00000000000
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/join_lwg3474.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2020 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++2a" }
-// { dg-do compile { target c++2a } }
-
-#include <ranges>
-#include <vector>
-
-void
-test01()
-{
- // LWG 3474. Nesting join_views is broken because of CTAD
- std::vector<std::vector<std::vector<int>>> nested_vectors = {
- {{1, 2, 3}, {4, 5}, {6}},
- {{7}, {8, 9}, {10, 11, 12}},
- {{13}}
- };
- auto joined = nested_vectors | std::views::join | std::views::join;
-
- using V = decltype(joined);
- static_assert( std::same_as<std::ranges::range_value_t<V>, int> );
-}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-11-18 16:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-18 16:11 [gcc r10-9048] libstdc++: Avoid CTAD for std::ranges::join_view [LWG 3474] Patrick Palka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).