Added implementation of thread local storage for OS/2.

[wxWidgets.git] / tests / arrays / arrays.cpp

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index f50901de147a8e816dbca7f4a1c002ec405ba4c7..42cacef17c59f37d1bc275d598215500a6b85ab8 100644 (file)
--- a/tests/arrays/arrays.cpp
+++ b/tests/arrays/arrays.cpp
@@ -139,6 +139,15 @@ WX_DEFINE_SORTED_ARRAY_CMP_SHORT(ushort, UShortCompareValues, wxSortedArrayUShor
 
 WX_DEFINE_SORTED_ARRAY_CMP_INT(int, IntCompareValues, wxSortedArrayInt);
 
+struct Item
+{
+    Item(int n_ = 0) : n(n_) { }
+
+    int n;
+};
+
+WX_DEFINE_ARRAY_PTR(Item *, ItemPtrArray);
+
 // ----------------------------------------------------------------------------
 // test class
 // ----------------------------------------------------------------------------
@@ -424,7 +433,8 @@ void ArraysTestCase::wxStringArraySplitJoinTest()
                    wxT("<title>Initial page of Mozilla Firefox</title>")
                    wxT("</meta></head></html>");
 
-    for (size_t i=0; i < WXSIZEOF(separators); i++)
+    size_t i;
+    for (i = 0; i < WXSIZEOF(separators); i++)
     {
         wxArrayString arr = wxSplit(str, separators[i]);
         CPPUNIT_ASSERT( str == wxJoin(arr, separators[i]) );
@@ -441,7 +451,7 @@ void ArraysTestCase::wxStringArraySplitJoinTest()
         };
     wxArrayString theArr(WXSIZEOF(arr), arr);
 
-    for (size_t i=0; i < WXSIZEOF(separators); i++)
+    for (i = 0; i < WXSIZEOF(separators); i++)
     {
         wxString string = wxJoin(theArr, separators[i]);
         CPPUNIT_ASSERT( theArr == wxSplit(string, separators[i]) );
@@ -593,4 +603,10 @@ void ArraysTestCase::TestSTL()
     {
         CPPUNIT_ASSERT( *it == i );
     }
+
+
+    ItemPtrArray items;
+    items.push_back(new Item(17));
+    CPPUNIT_ASSERT_EQUAL( 17, (*(items.rbegin()))->n );
+    CPPUNIT_ASSERT_EQUAL( 17, (**items.begin()).n );
 }