AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-2030 U_CPP_MEMORY_TEST -> U_OVERRIDE_CXX_ALLOCATION and add better documentation

Browse Source 
X-SVN-Rev: 9431
This commit is contained in:
George Rhoten 2002-07-30 07:42:00 +00:00
parent ff811b8693
commit cb2214eceb
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
icu4c/source/common/unicode/uobject.h
View File

@ -28,6 +28,7 @@ U_NAMESPACE_BEGIN
/* TODO undefine this symbol except for tests! See uobject.cpp */
// #define U_CPP_MEMORY_TEST
#define U_OVERRIDE_CXX_ALLOCATION 1
/**
* UObject is the common ICU base class.
@ -59,18 +60,27 @@ public:
*/
virtual inline ~UObject() {}
// possible overrides for ICU4C C++ memory management,
// not provided by ICU itself;
// simple, non-class types are allocated using the macros in common/cmemory.h
// (uprv_malloc(), uprv_free(), uprv_realloc());
// they or something else could be used here to implement C++ new/delete
// for ICU4C C++ classes
#define U_CPP_MEMORY_TEST
#ifdef U_CPP_MEMORY_TEST
#ifdef U_OVERRIDE_CXX_ALLOCATION
/**
* Overrides for ICU4C C++ memory management.
* simple, non-class types are allocated using the macros in common/cmemory.h
* (uprv_malloc(), uprv_free(), uprv_realloc());
* they or something else could be used here to implement C++ new/delete
* for ICU4C C++ classes
* @draft ICU 2.2
*/
void *operator new(size_t size);
/**
* Overrides for ICU4C C++ memory management.
* simple, non-class types are allocated using the macros in common/cmemory.h
* (uprv_malloc(), uprv_free(), uprv_realloc());
* they or something else could be used here to implement C++ new/delete
* for ICU4C C++ classes
* @draft ICU 2.2
*/
void operator delete(void *p);
#if 0
#if U_CXX_MEMORY_TEST
/* Sun Forte really dislikes these functions. */
void *operator new[](size_t size);
void operator delete[](void *p);

14
icu4c/source/common/uobject.cpp
View File

@ -14,17 +14,14 @@
* created by: Markus W. Scherer
*/
#include "unicode/utypes.h"
#include "unicode/uobject.h"
#ifdef U_CPP_MEMORY_TEST
# include "cmemory.h"
#endif
#ifdef U_OVERRIDE_CXX_ALLOCATION
#include "cmemory.h"
U_NAMESPACE_BEGIN
#ifdef U_CPP_MEMORY_TEST
/*
* Test implementation of UObject::new/delete
* using uprv_malloc() and uprv_free().
@ -66,7 +63,7 @@ void UObject::operator delete(void *p) {
}
}
#if 0
#if U_CXX_MEMORY_TEST
void *UObject::operator new[](size_t size) {
return uprv_malloc(size);
}
@ -90,6 +87,7 @@ void UObject::operator delete[](void *p, size_t /* size */) {
}
#endif
U_NAMESPACE_END
#endif
U_NAMESPACE_END