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

fixes to the new pointer array implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-06 16:26:25 +00:00
parent 0eeeb25fee
commit f1322419da
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dynarray.h
View File

@@ -463,7 +463,7 @@ private: \
// Some commonly used predefined base arrays // Some commonly used predefined base arrays
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WX_DECLARE_EXPORTED_BASEARRAY(void *, wxBaseArrayPtrVoid); WX_DECLARE_EXPORTED_BASEARRAY(const void *, wxBaseArrayPtrVoid);
WX_DECLARE_EXPORTED_BASEARRAY(short, wxBaseArrayShort); WX_DECLARE_EXPORTED_BASEARRAY(short, wxBaseArrayShort);
WX_DECLARE_EXPORTED_BASEARRAY(int, wxBaseArrayInt); WX_DECLARE_EXPORTED_BASEARRAY(int, wxBaseArrayInt);
WX_DECLARE_EXPORTED_BASEARRAY(long, wxBaseArrayLong); WX_DECLARE_EXPORTED_BASEARRAY(long, wxBaseArrayLong);

14
src/common/dynarray.cpp
View File

@@ -48,7 +48,7 @@
// wxBaseArray - dynamic array of 'T's // wxBaseArray - dynamic array of 'T's
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define _DECLARE_BASEARRAY(T, name) \ #define _WX_DEFINE_BASEARRAY(T, name) \
/* ctor */ \ /* ctor */ \
name::name() \ name::name() \
{ \ { \
@@ -217,7 +217,7 @@ size_t name::IndexForInsert(T lItem, CMPFUNC fnCompare) const \
while ( lo < hi ) { \ while ( lo < hi ) { \
i = (lo + hi)/2; \ i = (lo + hi)/2; \
\ \
res = (*fnCompare)((const void *)&lItem, (const void *)&(m_pItems[i])); \ res = (*fnCompare)((const void *)lItem, (const void *)(m_pItems[i])); \
if ( res < 0 ) \ if ( res < 0 ) \
hi = i; \ hi = i; \
else if ( res > 0 ) \ else if ( res > 0 ) \
@@ -292,9 +292,9 @@ void name::Sort(CMPFUNC fCmp) \
qsort(m_pItems, m_nCount, sizeof(T), fCmp); \ qsort(m_pItems, m_nCount, sizeof(T), fCmp); \
} }
_DECLARE_BASEARRAY(void *, wxBaseArrayPtrVoid) _WX_DEFINE_BASEARRAY(const void *, wxBaseArrayPtrVoid)
_DECLARE_BASEARRAY(short, wxBaseArrayShort) _WX_DEFINE_BASEARRAY(short, wxBaseArrayShort)
_DECLARE_BASEARRAY(int, wxBaseArrayInt) _WX_DEFINE_BASEARRAY(int, wxBaseArrayInt)
_DECLARE_BASEARRAY(long, wxBaseArrayLong) _WX_DEFINE_BASEARRAY(long, wxBaseArrayLong)
_DECLARE_BASEARRAY(double, wxBaseArrayDouble) //_WX_DEFINE_BASEARRAY(double, wxBaseArrayDouble)