diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/range_access.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/std/ranges/adaptors/93978.cc | 35 |
3 files changed, 43 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 98faff614da..b2e995b4daf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2020-03-06 Patrick Palka <ppalka@redhat.com> + + PR libstdc++/93978 + * include/bits/range_access.h (__cust_access::_Empty::operator()): + Declare return type to be bool instead of auto. + * testsuite/std/ranges/adaptors/93978.cc: New test. + 2020-03-06 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/94069 diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h index 8b276fd6625..4dd48bbc6df 100644 --- a/libstdc++-v3/include/bits/range_access.h +++ b/libstdc++-v3/include/bits/range_access.h @@ -793,7 +793,7 @@ namespace ranges template<typename _Tp> requires __member_empty<_Tp> || __size0_empty<_Tp> || __eq_iter_empty<_Tp> - constexpr auto + constexpr bool operator()(_Tp&& __e) const noexcept(_S_noexcept<_Tp>()) { if constexpr (__member_empty<_Tp>) diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/93978.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/93978.cc new file mode 100644 index 00000000000..a0152ec0532 --- /dev/null +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/93978.cc @@ -0,0 +1,35 @@ +// 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-additional-options "-O" } +// { dg-do compile { target c++2a } } + +#include <ranges> +#include <vector> + +namespace ranges = std::ranges; +namespace views = std::views; + +void +test() +{ + std::vector<std::string> x = {""}; + auto i = std::counted_iterator(x.begin(), 1); + auto r = ranges::subrange{i, std::default_sentinel}; + auto v = r | views::join; +} |