diff options
Diffstat (limited to 'thirdparty/icu4c/common/uobject.cpp')
-rw-r--r-- | thirdparty/icu4c/common/uobject.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/thirdparty/icu4c/common/uobject.cpp b/thirdparty/icu4c/common/uobject.cpp index e222b2ce9b..c9e435ceca 100644 --- a/thirdparty/icu4c/common/uobject.cpp +++ b/thirdparty/icu4c/common/uobject.cpp @@ -58,32 +58,32 @@ U_NAMESPACE_BEGIN * and replace with uprv_malloc/uprv_free. */ -void * U_EXPORT2 UMemory::operator new(size_t size) U_NOEXCEPT { +void * U_EXPORT2 UMemory::operator new(size_t size) noexcept { return uprv_malloc(size); } -void U_EXPORT2 UMemory::operator delete(void *p) U_NOEXCEPT { - if(p!=NULL) { +void U_EXPORT2 UMemory::operator delete(void *p) noexcept { + if(p!=nullptr) { uprv_free(p); } } -void * U_EXPORT2 UMemory::operator new[](size_t size) U_NOEXCEPT { +void * U_EXPORT2 UMemory::operator new[](size_t size) noexcept { return uprv_malloc(size); } -void U_EXPORT2 UMemory::operator delete[](void *p) U_NOEXCEPT { - if(p!=NULL) { +void U_EXPORT2 UMemory::operator delete[](void *p) noexcept { + if(p!=nullptr) { uprv_free(p); } } #if U_HAVE_DEBUG_LOCATION_NEW -void * U_EXPORT2 UMemory::operator new(size_t size, const char* /*file*/, int /*line*/) U_NOEXCEPT { +void * U_EXPORT2 UMemory::operator new(size_t size, const char* /*file*/, int /*line*/) noexcept { return UMemory::operator new(size); } -void U_EXPORT2 UMemory::operator delete(void* p, const char* /*file*/, int /*line*/) U_NOEXCEPT { +void U_EXPORT2 UMemory::operator delete(void* p, const char* /*file*/, int /*line*/) noexcept { UMemory::operator delete(p); } #endif /* U_HAVE_DEBUG_LOCATION_NEW */ @@ -93,7 +93,7 @@ void U_EXPORT2 UMemory::operator delete(void* p, const char* /*file*/, int /*lin UObject::~UObject() {} -UClassID UObject::getDynamicClassID() const { return NULL; } +UClassID UObject::getDynamicClassID() const { return nullptr; } U_NAMESPACE_END |