ICU-3221 Fix the AIX linker warning about multiple definitions of
virtual functions. X-SVN-Rev: 13129
This commit is contained in:
parent
6c5b038fb3
commit
9659f70c96
@ -160,7 +160,7 @@ public:
|
||||
*
|
||||
* @draft ICU 2.2
|
||||
*/
|
||||
virtual inline ~UObject() {}
|
||||
virtual ~UObject();
|
||||
|
||||
/**
|
||||
* ICU4C "poor man's RTTI", returns a UClassID for the actual ICU class.
|
||||
|
@ -15,13 +15,12 @@
|
||||
*/
|
||||
|
||||
#include "unicode/uobject.h"
|
||||
|
||||
#if U_OVERRIDE_CXX_ALLOCATION
|
||||
|
||||
#include "cmemory.h"
|
||||
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
#if U_OVERRIDE_CXX_ALLOCATION
|
||||
|
||||
/*
|
||||
* Default implementation of UMemory::new/delete
|
||||
* using uprv_malloc() and uprv_free().
|
||||
@ -77,7 +76,10 @@ void UMemory::operator delete[](void *p) {
|
||||
}
|
||||
}
|
||||
|
||||
U_NAMESPACE_END
|
||||
|
||||
#endif
|
||||
|
||||
UObject::~UObject() {}
|
||||
|
||||
U_NAMESPACE_END
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user