From 500dc9a6c335fba9be0c2aa9c6c489b7e09c8400 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 3 Sep 2015 15:35:43 +0100 Subject: [PATCH] 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 --- libstdc++-v3/ChangeLog | 8 ++++ .../include/bits/stl_iterator_base_funcs.h | 6 +++ .../24_iterators/operations/next_neg.cc | 42 +++++++++++++++++++ .../24_iterators/operations/prev_neg.cc | 42 +++++++++++++++++++ 4 files changed, 98 insertions(+) create mode 100644 libstdc++-v3/testsuite/24_iterators/operations/next_neg.cc create mode 100644 libstdc++-v3/testsuite/24_iterators/operations/prev_neg.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a5b973e387a..099863ddafc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2015-09-03 Jonathan Wakely + + 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 * testsuite/18_support/pthread_guard.cc: Add *-*-rtems* target diff --git a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h index 516f8fcc047..0f773292b66 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h +++ b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h @@ -205,6 +205,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION next(_ForwardIterator __x, typename iterator_traits<_ForwardIterator>::difference_type __n = 1) { + // concept requirements + __glibcxx_function_requires(_ForwardIteratorConcept< + _ForwardIterator>) std::advance(__x, __n); return __x; } @@ -214,6 +217,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION prev(_BidirectionalIterator __x, typename iterator_traits<_BidirectionalIterator>::difference_type __n = 1) { + // concept requirements + __glibcxx_function_requires(_BidirectionalIteratorConcept< + _BidirectionalIterator>) std::advance(__x, -__n); return __x; } diff --git a/libstdc++-v3/testsuite/24_iterators/operations/next_neg.cc b/libstdc++-v3/testsuite/24_iterators/operations/next_neg.cc new file mode 100644 index 00000000000..881307eb05b --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/operations/next_neg.cc @@ -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 +// . + +// { dg-options "-std=gnu++11 -D_GLIBCXX_CONCEPT_CHECKS" } +// { dg-do compile } + +#include + +struct X {}; + +namespace std +{ + template<> + struct iterator_traits : iterator_traits + { + 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 } +} diff --git a/libstdc++-v3/testsuite/24_iterators/operations/prev_neg.cc b/libstdc++-v3/testsuite/24_iterators/operations/prev_neg.cc new file mode 100644 index 00000000000..513e0e80b0b --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/operations/prev_neg.cc @@ -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 +// . + +// { dg-options "-std=gnu++11 -D_GLIBCXX_CONCEPT_CHECKS" } +// { dg-do compile } + +#include + +struct Y {}; + +namespace std +{ + template<> + struct iterator_traits : iterator_traits + { + 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 } +} -- 2.30.2