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

made wxDELETE[A]() template functions instead of macros; they now also check that their argument is fully declared (#9685)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-02 22:49:01 +00:00
parent 1c2b921a1c
commit 604fba2d34
11 changed files with 127 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/wx/defs.h
View File

@@ -611,15 +611,33 @@ typedef short int WXTYPE;
#include <stddef.h>
#endif
/* delete pointer if it is not NULL and NULL it afterwards */
/* (checking that it's !NULL before passing it to delete is just a */
/* a question of style, because delete will do it itself anyhow, but it might */
/* be considered as an error by some overzealous debugging implementations of */
/* the library, so we do it ourselves) */
#define wxDELETE(p) if ( (p) != NULL ) { delete p; p = NULL; }
#ifdef __cplusplus
// delete pointer if it is not NULL and NULL it afterwards
template <typename T>
inline void wxDELETE(T*& ptr)
{
typedef char TypeIsCompleteCheck[sizeof(T)];
/* delete an array and NULL it (see comments above) */
#define wxDELETEA(p) if ( (p) ) { delete [] (p); p = NULL; }
if ( ptr != NULL )
{
delete ptr;
ptr = NULL;
}
}
// delete an array and NULL it (see comments above)
template <typename T>
inline void wxDELETEA(T*& ptr)
{
typedef char TypeIsCompleteCheck[sizeof(T)];
if ( ptr != NULL )
{
delete [] ptr;
ptr = NULL;
}
}
#endif /*__cplusplus*/
/* size of statically declared array */
#define WXSIZEOF(array) (sizeof(array)/sizeof(array[0]))