diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 6a9fd1ba48e..12a89ab229f 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -2341,7 +2341,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } - decltype(auto) + constexpr decltype(auto) operator++(int) { __glibcxx_assert(_M_length > 0); @@ -2353,7 +2353,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ++_M_length; __throw_exception_again; } - } constexpr counted_iterator diff --git a/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3643.cc b/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3643.cc new file mode 100644 index 00000000000..e6f12b46c12 --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3643.cc @@ -0,0 +1,27 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } + +#include + +struct InputIterator +{ + using difference_type = int; + using value_type = int; + + constexpr int operator*() const noexcept { return 0; } + InputIterator& operator++() { return *this; } + constexpr void operator++(int) { } +}; + +static_assert( std::input_iterator ); +static_assert( !std::forward_iterator ); + +constexpr bool +test_lwg3643() +{ + std::counted_iterator iter({}, 1); + iter++; + return iter == std::default_sentinel; +} + +static_assert( test_lwg3643() );