Add concept checks to std::next and std::prev.
PR libstdc++/62039 * include/bits/stl_iterator_base_funcs.h (next, prev): Add concept checks. * testsuite/24_iterators/operations/prev_neg.cc: New. * testsuite/24_iterators/operations/next_neg.cc: New. From-SVN: r227447
This commit is contained in:
parent
42ec4ec863
commit
500dc9a6c3
|
@ -1,3 +1,11 @@
|
||||||
|
2015-09-03 Jonathan Wakely <jwakely@redhat.com>
|
||||||
|
|
||||||
|
PR libstdc++/62039
|
||||||
|
* include/bits/stl_iterator_base_funcs.h (next, prev): Add concept
|
||||||
|
checks.
|
||||||
|
* testsuite/24_iterators/operations/prev_neg.cc: New.
|
||||||
|
* testsuite/24_iterators/operations/next_neg.cc: New.
|
||||||
|
|
||||||
2015-09-03 Sebastian Huber <sebastian.huber@embedded-brains.de>
|
2015-09-03 Sebastian Huber <sebastian.huber@embedded-brains.de>
|
||||||
|
|
||||||
* testsuite/18_support/pthread_guard.cc: Add *-*-rtems* target
|
* testsuite/18_support/pthread_guard.cc: Add *-*-rtems* target
|
||||||
|
|
|
@ -205,6 +205,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
next(_ForwardIterator __x, typename
|
next(_ForwardIterator __x, typename
|
||||||
iterator_traits<_ForwardIterator>::difference_type __n = 1)
|
iterator_traits<_ForwardIterator>::difference_type __n = 1)
|
||||||
{
|
{
|
||||||
|
// concept requirements
|
||||||
|
__glibcxx_function_requires(_ForwardIteratorConcept<
|
||||||
|
_ForwardIterator>)
|
||||||
std::advance(__x, __n);
|
std::advance(__x, __n);
|
||||||
return __x;
|
return __x;
|
||||||
}
|
}
|
||||||
|
@ -214,6 +217,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
prev(_BidirectionalIterator __x, typename
|
prev(_BidirectionalIterator __x, typename
|
||||||
iterator_traits<_BidirectionalIterator>::difference_type __n = 1)
|
iterator_traits<_BidirectionalIterator>::difference_type __n = 1)
|
||||||
{
|
{
|
||||||
|
// concept requirements
|
||||||
|
__glibcxx_function_requires(_BidirectionalIteratorConcept<
|
||||||
|
_BidirectionalIterator>)
|
||||||
std::advance(__x, -__n);
|
std::advance(__x, -__n);
|
||||||
return __x;
|
return __x;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
// Copyright (C) 2015 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++11 -D_GLIBCXX_CONCEPT_CHECKS" }
|
||||||
|
// { dg-do compile }
|
||||||
|
|
||||||
|
#include <iterator>
|
||||||
|
|
||||||
|
struct X {};
|
||||||
|
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
|
template<>
|
||||||
|
struct iterator_traits<const X*> : iterator_traits<X*>
|
||||||
|
{
|
||||||
|
using iterator_category = input_iterator_tag;
|
||||||
|
using reference = const X&;
|
||||||
|
using pointer = const X*;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
test01()
|
||||||
|
{
|
||||||
|
const X array[1] = { };
|
||||||
|
std::next(array);
|
||||||
|
// { dg-error "input_iterator" "" { target *-*-* } 220 }
|
||||||
|
}
|
|
@ -0,0 +1,42 @@
|
||||||
|
// Copyright (C) 2015 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++11 -D_GLIBCXX_CONCEPT_CHECKS" }
|
||||||
|
// { dg-do compile }
|
||||||
|
|
||||||
|
#include <iterator>
|
||||||
|
|
||||||
|
struct Y {};
|
||||||
|
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
|
template<>
|
||||||
|
struct iterator_traits<const Y*> : iterator_traits<Y*>
|
||||||
|
{
|
||||||
|
using iterator_category = forward_iterator_tag;
|
||||||
|
using reference = const Y&;
|
||||||
|
using pointer = const Y*;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
test02()
|
||||||
|
{
|
||||||
|
const Y array[1] = { };
|
||||||
|
std::prev(array + 1);
|
||||||
|
// { dg-error "forward_iterator" "" { target *-*-* } 220 }
|
||||||
|
}
|
Loading…
Reference in New Issue