X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fecddbaa5d0e9727c084e822e27d7db58462c266..197ab43d72571ecfd86c35f1832f063237775648:/tests/arrays/arrays.cpp?ds=sidebyside diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp index 3df8126846..a5a26644f3 100644 --- a/tests/arrays/arrays.cpp +++ b/tests/arrays/arrays.cpp @@ -94,7 +94,7 @@ size_t Bar::ms_bars = 0; WX_DECLARE_OBJARRAY(Bar, ArrayBars); #include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(ArrayBars); +WX_DEFINE_OBJARRAY(ArrayBars) // ---------------------------------------------------------------------------- // helpers for sorting arrays and comparing items @@ -125,9 +125,9 @@ int wxCMPFUNC_CONV name ## RevCompare(T* first, T* second) \ typedef unsigned short ushort; -DEFINE_COMPARE(Char, char); -DEFINE_COMPARE(UShort, ushort); -DEFINE_COMPARE(Int, int); +DEFINE_COMPARE(Char, char) +DEFINE_COMPARE(UShort, ushort) +DEFINE_COMPARE(Int, int) WX_DEFINE_ARRAY_CHAR(char, wxArrayChar); WX_DEFINE_SORTED_ARRAY_CHAR(char, wxSortedArrayCharNoCmp); @@ -539,11 +539,11 @@ void ArraysTestCase::wxArray ## name ## Test() \ CPPUNIT_ASSERT( b.Index( 17 ) == 3 ); \ } -TestArrayOf(UShort); +TestArrayOf(UShort) -TestArrayOf(Char); +TestArrayOf(Char) -TestArrayOf(Int); +TestArrayOf(Int) void ArraysTestCase::Alloc() { @@ -609,11 +609,7 @@ void ArraysTestCase::Swap() { DoTestSwap("Foo", "Bar", "Baz", (wxArrayString *)NULL); - // VC6 can't compile this call with mysterious error about in DoTestSwap() -#ifndef __VISUALC6__ DoTestSwap(1, 10, 100, (wxArrayInt *)NULL); -#endif - DoTestSwap(6, 28, 496, (wxArrayLong *)NULL); }