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

fixed WX_APPEND_ARRAY and WX_CLEAR_ARRAY when used with dereferenced pointers (*array)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-05-20 11:56:20 +00:00
parent c20facdb25
commit 5d5b1c0ce0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/dynarray.h
View File

@@ -454,10 +454,10 @@ WX_DEFINE_EXPORTED_ARRAY(void *, wxArrayPtrVoid);
// append all element of one array to another one // append all element of one array to another one
#define WX_APPEND_ARRAY(array, other) \ #define WX_APPEND_ARRAY(array, other) \
{ \ { \
size_t count = other.Count(); \ size_t count = (other).Count(); \
for ( size_t n = 0; n < count; n++ ) \ for ( size_t n = 0; n < count; n++ ) \
{ \ { \
array.Add(other[n]); \ (array).Add((other)[n]); \
} \ } \
} }
@@ -469,13 +469,13 @@ WX_DEFINE_EXPORTED_ARRAY(void *, wxArrayPtrVoid);
// count on it)! // count on it)!
#define WX_CLEAR_ARRAY(array) \ #define WX_CLEAR_ARRAY(array) \
{ \ { \
size_t count = array.Count(); \ size_t count = (array).Count(); \
for ( size_t n = 0; n < count; n++ ) \ for ( size_t n = 0; n < count; n++ ) \
{ \ { \
delete array[n]; \ delete (array)[n]; \
} \ } \
\ \
array.Empty(); \ (array).Empty(); \
} }
#endif // _DYNARRAY_H #endif // _DYNARRAY_H