From: Jonathan Wakely <redi@gcc.gnu.org>
Date: Thu, 30 Dec 2004 02:49:59 +0000 (+0000)
Subject: vector.tcc (erase(iterator, iterator), [...]): Qualify all calls to std::copy().
X-Git-Tag: releases/gcc-3.4.4~356
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ed1d749c78092facb1fbf113217a017306dae24;p=thirdparty%2Fgcc.git

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: r92725
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c45ff17189e4..02c456f9b8f4 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-23  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 abd1ba76250e..786afab2ec96 100644
--- a/libstdc++-v3/include/bits/vector.tcc
+++ b/libstdc++-v3/include/bits/vector.tcc
@@ -1,6 +1,6 @@
 // Vector implementation (out of line) -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004 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
@@ -118,7 +118,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->_M_impl._M_finish = this->_M_impl._M_finish - (__last - __first);
       return __first;
@@ -143,7 +143,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());
         }
         else
@@ -209,7 +209,7 @@ namespace _GLIBCXX_STD
       }
       else if (size() >= __len)
       {
-        iterator __new_finish(copy(__first, __last, this->_M_impl._M_start));
+        iterator __new_finish(std::copy(__first, __last, this->_M_impl._M_start));
         std::_Destroy(__new_finish, end());
         this->_M_impl._M_finish = __new_finish.base();
       }