Return-Path: Delivered-To: apmail-stdcxx-commits-archive@www.apache.org Received: (qmail 39393 invoked from network); 14 Aug 2009 16:44:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Aug 2009 16:44:23 -0000 Received: (qmail 11190 invoked by uid 500); 14 Aug 2009 16:44:30 -0000 Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org Received: (qmail 11160 invoked by uid 500); 14 Aug 2009 16:44:30 -0000 Mailing-List: contact commits-help@stdcxx.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@stdcxx.apache.org Delivered-To: mailing list commits@stdcxx.apache.org Received: (qmail 11149 invoked by uid 99); 14 Aug 2009 16:44:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Aug 2009 16:44:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Aug 2009 16:44:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8A6032388857; Fri, 14 Aug 2009 16:43:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r804290 - in /stdcxx/branches/4.3.x: include/vector.cc tests/regress/23.vector.stdcxx-1037.cpp Date: Fri, 14 Aug 2009 16:43:51 -0000 To: commits@stdcxx.apache.org From: faridz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090814164351.8A6032388857@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: faridz Date: Fri Aug 14 16:43:51 2009 New Revision: 804290 URL: http://svn.apache.org/viewvc?rev=804290&view=rev Log: 2009-08-14 Farid Zaripov Merged r804283, r804285 from 4.2.x branch * tests/regress/23.vector.stdcxx-1037.cpp: New regression test for STDCXX-1037. STDCXX-1037 * include/vector.cc: Assign __other's data to self before swaping __other with __tmp. Added: stdcxx/branches/4.3.x/tests/regress/23.vector.stdcxx-1037.cpp - copied unchanged from r804283, stdcxx/branches/4.2.x/tests/regress/23.vector.stdcxx-1037.cpp Modified: stdcxx/branches/4.3.x/include/vector.cc Modified: stdcxx/branches/4.3.x/include/vector.cc URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/vector.cc?rev=804290&r1=804289&r2=804290&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/vector.cc (original) +++ stdcxx/branches/4.3.x/include/vector.cc Fri Aug 14 16:43:51 2009 @@ -133,6 +133,7 @@ _RWSTD_ASSERT (__tmp.get_allocator () == __other.get_allocator ()); __tmp.assign (begin (), end ()); + assign (__other.begin (), __other.end ()); __other.swap (__tmp); }