mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-11 04:24:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

vector.tcc (erase(iterator, iterator), [...]): Qualify all calls to std::copy().

Browse Source 
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
This commit is contained in:
Jonathan Wakely 2004-12-30 02:32:04 +00:00 committed by Paolo Carlini
parent 8d6cdc6839
commit 86cdac1133
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -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.

6
libstdc++-v3/include/bits/vector.tcc
View File

@ -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();