ICU-8.11.4.tar.gz

[apple/icu.git] / icuSources / common / uobject.cpp

diff --git a/icuSources/common/uobject.cpp b/icuSources/common/uobject.cpp
index e425c881d483b3b488e3cbd56fc670b3e2d37bb1..5fc5423880ef256e6e45076df40ee51cd3c56752 100644 (file)
--- a/icuSources/common/uobject.cpp
+++ b/icuSources/common/uobject.cpp
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
 /*
 ******************************************************************************
 *

-*   Copyright (C) 2002, International Business Machines
+*   Copyright (C) 2002-2005, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************


@@ -15,13 +15,12 @@
 */
 
 #include "unicode/uobject.h"
 */
 
 #include "unicode/uobject.h"

-
-#if U_OVERRIDE_CXX_ALLOCATION
-

 #include "cmemory.h"
 
 U_NAMESPACE_BEGIN
 
 #include "cmemory.h"
 
 U_NAMESPACE_BEGIN
 

+#if U_OVERRIDE_CXX_ALLOCATION
+

 /*
  * Default implementation of UMemory::new/delete
  * using uprv_malloc() and uprv_free().
 /*
  * Default implementation of UMemory::new/delete
  * using uprv_malloc() and uprv_free().


@@ -57,27 +56,59 @@ U_NAMESPACE_BEGIN
  * and replace with uprv_malloc/uprv_free.
  */
 
  * and replace with uprv_malloc/uprv_free.
  */
 

-void *UMemory::operator new(size_t size) {
+void * U_EXPORT2 UMemory::operator new(size_t size) {

     return uprv_malloc(size);
 }
 
     return uprv_malloc(size);
 }
 

-void UMemory::operator delete(void *p) {
+void U_EXPORT2 UMemory::operator delete(void *p) {

     if(p!=NULL) {
         uprv_free(p);
     }
 }
 
     if(p!=NULL) {
         uprv_free(p);
     }
 }
 

-void *UMemory::operator new[](size_t size) {
+void * U_EXPORT2 UMemory::operator new[](size_t size) {

     return uprv_malloc(size);
 }
 
     return uprv_malloc(size);
 }
 

-void UMemory::operator delete[](void *p) {
+void U_EXPORT2 UMemory::operator delete[](void *p) {

     if(p!=NULL) {
         uprv_free(p);
     }
 }
 
     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*/) {
+    return UMemory::operator new(size);
+}
+
+void U_EXPORT2 UMemory::operator delete(void* p, const char* /*file*/, int /*line*/) {
+    UMemory::operator delete(p);
+}
+#endif /* U_HAVE_DEBUG_LOCATION_NEW */
+

 
 #endif
 
 
 #endif
 

+UObject::~UObject() {}
+
+// Future implementation for RTTI that support subtyping. [alan]
+// 
+// UClassID UObject::getStaticClassID() {
+//     return (UClassID) NULL;
+// }
+// 
+// UBool UObject::instanceOf(UClassID type) const {
+//     UClassID c = getDynamicClassID();
+//     for (;;) {
+//         if (c == type) {
+//             return TRUE;
+//         } else if (c == (UClassID) NULL) {
+//             return FALSE;
+//         }
+//         c = * (UClassID*) c;
+//     }
+// }
+
+U_NAMESPACE_END
+
+