diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-07 14:43:22 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-07 14:43:22 +0000 |
| commit | 1795c35e99e2bd6fadaa3cbb2c8d836fcd30dbdd (patch) | |
| tree | e4583c5961ca8fdbf421cd6f31d97e91e4b417af /libstdc++-v3/include/debug | |
| parent | a79381fef3001627d7f90e9c725938478b1e344d (diff) | |
| download | gcc-1795c35e99e2bd6fadaa3cbb2c8d836fcd30dbdd.tar.gz | |
PR libstdc++/61086
* include/bits/stl_iterator.h (__normal_iterator::_M_const_cast):
Remove.
* include/bits/stl_vector.h (vector::insert, vector::erase): Use
arithmetic to obtain a mutable iterator from const_iterator.
* include/bits/vector.tcc (vector::insert): Likewise.
* include/debug/vector (vector::erase): Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210162 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/debug')
| -rw-r--r-- | libstdc++-v3/include/debug/vector | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector index 427d19fd4a9..f92a77fed11 100644 --- a/libstdc++-v3/include/debug/vector +++ b/libstdc++-v3/include/debug/vector @@ -647,7 +647,7 @@ namespace __debug } else #if __cplusplus >= 201103L - return iterator(__first.base()._M_const_cast(), this); + return begin() + (__first.base() - cbegin().base()); #else return __first; #endif |