Added wxVector::swap().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 87e2375e6136bb4d115a9ab8f56944fb7575368b..3a45abc5f4bda0e3371845830d2fbc0f30a2655e 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -357,6 +357,7 @@ All:
 - Include port number in host header in wxHTTP (Marcin 'Malcom' Malich).
 - Added wxTempFile::Flush().
 - Added support for wxLongLong and wxULongLong in wxVariant.
 - Include port number in host header in wxHTTP (Marcin 'Malcom' Malich).
 - Added wxTempFile::Flush().
 - Added support for wxLongLong and wxULongLong in wxVariant.

+- Added wxVector::swap().

 
 All (GUI):
 
 
 All (GUI):
 

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 5375f9c5dfdbd161a5b676de2d9ee7b61a06771f..28230a9ea5c2d609836f9f8ccb890a9cbb2e556b 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -195,6 +195,13 @@ public:
         clear();
     }
 
         clear();
     }
 

+    void swap(wxVector& v)
+    {
+        wxSwap(m_size, v.m_size);
+        wxSwap(m_capacity, v.m_capacity);
+        wxSwap(m_values, v.m_values);
+    }
+

     void clear()
     {
         // call destructors of stored objects:
     void clear()
     {
         // call destructors of stored objects:

diff --git a/tests/vectors/vectors.cpp b/tests/vectors/vectors.cpp
index f93afddf7e3008170ad94af154d99b1ee9a7827a..4803068aab8f4478c244b6c1467b17d87c516772 100644 (file)
--- a/tests/vectors/vectors.cpp
+++ b/tests/vectors/vectors.cpp
@@ -83,6 +83,7 @@ private:
         CPPUNIT_TEST( Objects );
         CPPUNIT_TEST( NonPODs );
         CPPUNIT_TEST( Resize );
         CPPUNIT_TEST( Objects );
         CPPUNIT_TEST( NonPODs );
         CPPUNIT_TEST( Resize );

+        CPPUNIT_TEST( Swap );

     CPPUNIT_TEST_SUITE_END();
 
     void PushPopTest();
     CPPUNIT_TEST_SUITE_END();
 
     void PushPopTest();


@@ -92,6 +93,7 @@ private:
     void Objects();
     void NonPODs();
     void Resize();
     void Objects();
     void NonPODs();
     void Resize();

+    void Swap();

 
     DECLARE_NO_COPY_CLASS(VectorsTestCase)
 };
 
     DECLARE_NO_COPY_CLASS(VectorsTestCase)
 };


@@ -266,3 +268,24 @@ void VectorsTestCase::Resize()
     CPPUNIT_ASSERT_EQUAL( 17, v[3].GetValue() );
 }
 
     CPPUNIT_ASSERT_EQUAL( 17, v[3].GetValue() );
 }
 

+void VectorsTestCase::Swap()
+{
+    wxVector<int> v1, v2;
+    v1.push_back(17);
+    v1.swap(v2);
+    CPPUNIT_ASSERT( v1.empty() );
+    CPPUNIT_ASSERT_EQUAL( 1, v2.size() );
+    CPPUNIT_ASSERT_EQUAL( 17, v2[0] );
+
+    v1.push_back(9);
+    v2.swap(v1);
+    CPPUNIT_ASSERT_EQUAL( 1, v1.size() );
+    CPPUNIT_ASSERT_EQUAL( 17, v1[0] );
+    CPPUNIT_ASSERT_EQUAL( 1, v2.size() );
+    CPPUNIT_ASSERT_EQUAL( 9, v2[0] );
+
+    v2.clear();
+    v1.swap(v2);
+    CPPUNIT_ASSERT( v1.empty() );
+}
+