diff options
| -rw-r--r-- | libstdc++-v3/include/bits/stl_vector.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/std/ranges/conv/1.cc | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 43d3cd1..9c75f64 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -778,7 +778,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER // but will not destroy elements. This RAII type destroys them. struct _Clear { - ~_Clear() { if (_M_this) _M_this->clear(); } + constexpr ~_Clear() { if (_M_this) _M_this->clear(); } vector* _M_this; } __guard{this}; diff --git a/libstdc++-v3/testsuite/std/ranges/conv/1.cc b/libstdc++-v3/testsuite/std/ranges/conv/1.cc index 09fd515..231cb9d 100644 --- a/libstdc++-v3/testsuite/std/ranges/conv/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/conv/1.cc @@ -466,6 +466,18 @@ test_composition() auto str = adaptor(" "); } +constexpr bool +test_pr119282() +{ + // PR libstdc++/119282 + auto v = std::array{1, 2, 3} + | std::views::transform([](auto x) { return std::array{x}; }) + | std::views::join + | std::ranges::to<std::vector>(); + VERIFY( std::ranges::size(v) == 3 ); + return true; +} + int main() { test_p1206r7_examples(); @@ -480,4 +492,5 @@ int main() test_constexpr(); test_sfinae(); test_composition(); + static_assert(test_pr119282()); } |