procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Fix __gnu_test::input_iterator_wrapper::operator++(int)

Browse source 
I noticed recently that our input_iterator_wrapper utility for writing
tests has the following post-increment operator:

    void
    operator++(int)
    {
      ++*this;
    }

That fails to meet the Cpp17InputIterator requirement that *r++ is
valid. This change makes it return a non-void proxy type that can be
deferenced to produce another proxy, which is convertible to the
value_type. The second proxy converts to const T& to ensure it can't be
written to.

	* testsuite/util/testsuite_iterators.h:
	(input_iterator_wrapper::operator++(int)): Return proxy object.
This commit is contained in:
Jonathan Wakely 2020-06-01 18:30:47 +01:00
parent 1746d5f3e6
commit 118158b646
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libstdc++-v3/testsuite/util/testsuite_iterators.h
View file

@ -208,6 +208,17 @@ namespace __gnu_test
: public std::iterator<std::input_iterator_tag, typename remove_cv<T>::type,
std::ptrdiff_t, T*, T&>
{
struct post_inc_proxy
{
struct deref_proxy
{
T* ptr;
operator const T&() const { return *ptr; }
} p;
deref_proxy operator*() const { return p; }
};
protected:
input_iterator_wrapper() : ptr(0), SharedInfo(0)
{ }
@ -266,10 +277,12 @@ namespace __gnu_test
return *this;
}
void
post_inc_proxy
operator++(int)
{
post_inc_proxy tmp = { { ptr } };
++*this;
return tmp;
}
#if __cplusplus >= 201103L