X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b75a7d8f3b4adbae880cab104ce2c6a50eee4db2..ef6cf650f4a75c3f97de06b51fa104f2069b9ea2:/icuSources/common/uobject.cpp?ds=sidebyside

diff --git a/icuSources/common/uobject.cpp b/icuSources/common/uobject.cpp
index e425c881..900e0345 100644
--- a/icuSources/common/uobject.cpp
+++ b/icuSources/common/uobject.cpp
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 2002, International Business Machines
+*   Copyright (C) 2002-2012, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
@@ -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().
@@ -57,27 +56,48 @@ U_NAMESPACE_BEGIN
  * and replace with uprv_malloc/uprv_free.
  */
 
-void *UMemory::operator new(size_t size) {
+void * U_EXPORT2 UMemory::operator new(size_t size) U_NO_THROW {
     return uprv_malloc(size);
 }
 
-void UMemory::operator delete(void *p) {
+void U_EXPORT2 UMemory::operator delete(void *p) U_NO_THROW {
     if(p!=NULL) {
         uprv_free(p);
     }
 }
 
-void *UMemory::operator new[](size_t size) {
+void * U_EXPORT2 UMemory::operator new[](size_t size) U_NO_THROW {
     return uprv_malloc(size);
 }
 
-void UMemory::operator delete[](void *p) {
+void U_EXPORT2 UMemory::operator delete[](void *p) U_NO_THROW {
     if(p!=NULL) {
         uprv_free(p);
     }
 }
 
-U_NAMESPACE_END
+#if U_HAVE_DEBUG_LOCATION_NEW
+void * U_EXPORT2 UMemory::operator new(size_t size, const char* /*file*/, int /*line*/) U_NO_THROW {
+    return UMemory::operator new(size);
+}
+
+void U_EXPORT2 UMemory::operator delete(void* p, const char* /*file*/, int /*line*/) U_NO_THROW {
+    UMemory::operator delete(p);
+}
+#endif /* U_HAVE_DEBUG_LOCATION_NEW */
+
 
 #endif
 
+UObject::~UObject() {}
+
+UClassID UObject::getDynamicClassID() const { return NULL; }
+
+U_NAMESPACE_END
+
+U_NAMESPACE_USE
+
+U_CAPI void U_EXPORT2
+uprv_deleteUObject(void *obj) {
+    delete static_cast<UObject *>(obj);
+}