Commit 86cdac11 by Jonathan Wakely Committed by Paolo Carlini

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
parent 8d6cdc68
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> 2004-12-29 Paolo Carlini <pcarlini@suse.de>
Minimal fixes for -fno-exceptions. Minimal fixes for -fno-exceptions.
......
...@@ -121,7 +121,7 @@ namespace _GLIBCXX_STD ...@@ -121,7 +121,7 @@ namespace _GLIBCXX_STD
vector<_Tp, _Alloc>:: vector<_Tp, _Alloc>::
erase(iterator __first, iterator __last) 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()); std::_Destroy(__i, end(), this->get_allocator());
this->_M_impl._M_finish = this->_M_impl._M_finish - (__last - __first); this->_M_impl._M_finish = this->_M_impl._M_finish - (__last - __first);
return __first; return __first;
...@@ -149,7 +149,7 @@ namespace _GLIBCXX_STD ...@@ -149,7 +149,7 @@ namespace _GLIBCXX_STD
} }
else if (size() >= __xlen) 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()); std::_Destroy(__i, end(), this->get_allocator());
} }
else else
...@@ -226,7 +226,7 @@ namespace _GLIBCXX_STD ...@@ -226,7 +226,7 @@ namespace _GLIBCXX_STD
} }
else if (size() >= __len) else if (size() >= __len)
{ {
iterator __new_finish(copy(__first, __last, iterator __new_finish(std::copy(__first, __last,
this->_M_impl._M_start)); this->_M_impl._M_start));
std::_Destroy(__new_finish, end(), this->get_allocator()); std::_Destroy(__new_finish, end(), this->get_allocator());
this->_M_impl._M_finish = __new_finish.base(); this->_M_impl._M_finish = __new_finish.base();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment