Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed array tests compilation and a bug in obj array test

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-04-26 21:59:23 +00:00
parent 3b0b5f13f5
commit 3dc0174140
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
samples/console/console.cpp
View File

@@ -91,7 +91,7 @@
#undef TEST_ALL #undef TEST_ALL
static const bool TEST_ALL = TRUE; static const bool TEST_ALL = TRUE;
#else #else
#define TEST_FILENAME #define TEST_ARRAYS
static const bool TEST_ALL = FALSE; static const bool TEST_ALL = FALSE;
#endif #endif
@@ -115,6 +115,7 @@ class Bar // Foo is already taken in the hash test
{ {
public: public:
Bar(const wxString& name) : m_name(name) { ms_bars++; } Bar(const wxString& name) : m_name(name) { ms_bars++; }
Bar(const Bar& bar) : m_name(bar.m_name) { ms_bars++; }
~Bar() { ms_bars--; } ~Bar() { ms_bars--; }
static size_t GetNumber() { return ms_bars; } static size_t GetNumber() { return ms_bars; }
@@ -5083,6 +5084,8 @@ static void TestSemaphore()
#include "wx/dynarray.h" #include "wx/dynarray.h"
typedef unsigned short ushort;
#define DefineCompare(name, T) \ #define DefineCompare(name, T) \
\ \
int wxCMPFUNC_CONV name ## CompareValues(T first, T second) \ int wxCMPFUNC_CONV name ## CompareValues(T first, T second) \
@@ -5100,14 +5103,14 @@ int wxCMPFUNC_CONV name ## RevCompare(T* first, T* second) \
return *second - *first; \ return *second - *first; \
} \ } \
DefineCompare(Short, short); DefineCompare(UShort, ushort);
DefineCompare(Int, int); DefineCompare(Int, int);
// test compilation of all macros // test compilation of all macros
WX_DEFINE_ARRAY(short, wxArrayShort); WX_DEFINE_ARRAY_SHORT(ushort, wxArrayUShort);
WX_DEFINE_SORTED_ARRAY(short, wxSortedArrayShortNoCmp); WX_DEFINE_SORTED_ARRAY_SHORT(ushort, wxSortedArrayUShortNoCmp);
WX_DEFINE_SORTED_ARRAY_CMP(short, ShortCompareValues, wxSortedArrayShort); WX_DEFINE_SORTED_ARRAY_CMP_SHORT(ushort, UShortCompareValues, wxSortedArrayUShort);
WX_DEFINE_SORTED_ARRAY_CMP(int, IntCompareValues, wxSortedArrayInt); WX_DEFINE_SORTED_ARRAY_CMP_INT(int, IntCompareValues, wxSortedArrayInt);
WX_DECLARE_OBJARRAY(Bar, ArrayBars); WX_DECLARE_OBJARRAY(Bar, ArrayBars);
#include "wx/arrimpl.cpp" #include "wx/arrimpl.cpp"
@@ -5185,7 +5188,7 @@ static void TestArrayOf ## name ## s() \
PrintArray("b", b); \ PrintArray("b", b); \
} }
TestArrayOf(Short); TestArrayOf(UShort);
TestArrayOf(Int); TestArrayOf(Int);
static void TestArrayOfObjects() static void TestArrayOfObjects()
@@ -5761,7 +5764,7 @@ int main(int argc, char **argv)
PrintArray("a1", a1); PrintArray("a1", a1);
TestArrayOfObjects(); TestArrayOfObjects();
TestArrayOfShorts(); TestArrayOfUShorts();
} }
TestArrayOfInts(); TestArrayOfInts();