diff options
| author | Jonathan Wakely <redi@gcc.gnu.org> | 2004-12-30 02:32:04 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2004-12-30 02:32:04 +0000 |
| commit | 86cdac113375a75b96ad79412b667838bf3c00f0 (patch) | |
| tree | 56005f51acbcca54da28a7491a207d71c4d55c15 | |
| parent | 8d6cdc6839e77c1821a45d50a52a3b4cc29313ea (diff) | |
| download | gcc-86cdac113375a75b96ad79412b667838bf3c00f0.zip gcc-86cdac113375a75b96ad79412b667838bf3c00f0.tar.gz gcc-86cdac113375a75b96ad79412b667838bf3c00f0.tar.bz2 | |
vector.tcc (erase(iterator, iterator), [...]): Qualify all calls to std::copy().
2004-12-29 Jonathan Wakely <redi@gcc.gnu.org>
* include/bits/vector.tcc (erase(iterator, iterator),
operator=, _M_assign_aux(_ForwardIterator, _ForwardIterator,
forward_iterator_tag)): Qualify all calls to std::copy().
From-SVN: r92724
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/vector.tcc | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4f9c8d0..a49240f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2004-12-29 Jonathan Wakely <redi@gcc.gnu.org> + + * include/bits/vector.tcc (erase(iterator, iterator), + operator=, _M_assign_aux(_ForwardIterator, _ForwardIterator, + forward_iterator_tag)): Qualify all calls to std::copy(). + 2004-12-29 Paolo Carlini <pcarlini@suse.de> Minimal fixes for -fno-exceptions. diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc index 5dc3cd4..57144b0 100644 --- a/libstdc++-v3/include/bits/vector.tcc +++ b/libstdc++-v3/include/bits/vector.tcc @@ -121,7 +121,7 @@ namespace _GLIBCXX_STD vector<_Tp, _Alloc>:: erase(iterator __first, iterator __last) { - iterator __i(copy(__last, end(), __first)); + iterator __i(std::copy(__last, end(), __first)); std::_Destroy(__i, end(), this->get_allocator()); this->_M_impl._M_finish = this->_M_impl._M_finish - (__last - __first); return __first; @@ -149,7 +149,7 @@ namespace _GLIBCXX_STD } else if (size() >= __xlen) { - iterator __i(copy(__x.begin(), __x.end(), begin())); + iterator __i(std::copy(__x.begin(), __x.end(), begin())); std::_Destroy(__i, end(), this->get_allocator()); } else @@ -226,7 +226,7 @@ namespace _GLIBCXX_STD } else if (size() >= __len) { - iterator __new_finish(copy(__first, __last, + iterator __new_finish(std::copy(__first, __last, this->_M_impl._M_start)); std::_Destroy(__new_finish, end(), this->get_allocator()); this->_M_impl._M_finish = __new_finish.base(); |