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  <faridz@apache.org>

	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);
 }