From: Jonathan Wakely <redi@gcc.gnu.org>
Date: Sun, 16 Jan 2005 22:08:43 +0000 (+0000)
Subject: rope: Qualify calls to std::copy() by sequence_buffer.
X-Git-Tag: releases/gcc-3.4.4~305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89642d161af6f6be1065e6a9c786160c86cdd8d0;p=thirdparty%2Fgcc.git

rope: Qualify calls to std::copy() by sequence_buffer.

2005-01-16  Jonathan Wakely  <redi@gcc.gnu.org>

	* include/ext/rope: Qualify calls to std::copy() by sequence_buffer.
	* testsuite/ext/rope/4.cc: Add.

From-SVN: r93740
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index abc6803251bd..3a32cb451f78 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-16  Jonathan Wakely  <redi@gcc.gnu.org>
+
+	* include/ext/rope: Qualify calls to std::copy() by sequence_buffer.
+	* testsuite/ext/rope/4.cc: Add.
+
 2005-01-12  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/stl_algobase.h (lexicographical_compare):
diff --git a/libstdc++-v3/include/ext/rope b/libstdc++-v3/include/ext/rope
index 95afd82e0b55..b4bf2c9650ca 100644
--- a/libstdc++-v3/include/ext/rope
+++ b/libstdc++-v3/include/ext/rope
@@ -1,6 +1,6 @@
 // SGI's rope class -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 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
@@ -152,7 +152,7 @@ class sequence_buffer : public iterator<std::output_iterator_tag,void,void,void,
         sequence_buffer(const sequence_buffer& __x) {
             _M_prefix = __x._M_prefix;
             _M_buf_count = __x._M_buf_count;
-            copy(__x._M_buffer, __x._M_buffer + __x._M_buf_count, _M_buffer);
+            std::copy(__x._M_buffer, __x._M_buffer + __x._M_buf_count, _M_buffer);
         }
         sequence_buffer(sequence_buffer& __x) {
             __x.flush();
@@ -169,7 +169,7 @@ class sequence_buffer : public iterator<std::output_iterator_tag,void,void,void,
         sequence_buffer& operator= (const sequence_buffer& __x) {
             _M_prefix = __x._M_prefix;
             _M_buf_count = __x._M_buf_count;
-            copy(__x._M_buffer, __x._M_buffer + __x._M_buf_count, _M_buffer);
+            std::copy(__x._M_buffer, __x._M_buffer + __x._M_buf_count, _M_buffer);
             return *this;
         }
         void push_back(value_type __x)