ICU-8.11.tar.gz

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

diff --git a/icuSources/common/unistr.cpp b/icuSources/common/unistr.cpp
index 640ef899f1ebfb7b8fc3788a92fa249f41d7adfd..1b3e9da5f8f96ab81c0ff86661ebc9bbeab0fee3 100644 (file)
--- a/icuSources/common/unistr.cpp
+++ b/icuSources/common/unistr.cpp
@@ -1,6 +1,6 @@
 /*
 ******************************************************************************
 /*
 ******************************************************************************

-* Copyright (C) 1999-2004, International Business Machines Corporation and   *
+* Copyright (C) 1999-2005, International Business Machines Corporation and   *

 * others. All Rights Reserved.                                               *
 ******************************************************************************
 *
 * others. All Rights Reserved.                                               *
 ******************************************************************************
 *


@@ -302,7 +302,7 @@ UnicodeString::UnicodeString(const char *src, int32_t length, EInvariant)
     // treat as an empty string
   } else {
     if(length<0) {
     // treat as an empty string
   } else {
     if(length<0) {

-      length=uprv_strlen(src);
+      length=(int32_t)uprv_strlen(src);

     }
     if(cloneArrayIfNeeded(length, length, FALSE)) {
       u_charsToUChars(src, getArrayStart(), length);
     }
     if(cloneArrayIfNeeded(length, length, FALSE)) {
       u_charsToUChars(src, getArrayStart(), length);


@@ -759,7 +759,7 @@ UnicodeString::indexOf(const UChar *srcChars,
   if(match == NULL) {
     return -1;
   } else {
   if(match == NULL) {
     return -1;
   } else {

-    return match - fArray;
+    return (int32_t)(match - fArray);

   }
 }
 
   }
 }
 


@@ -776,7 +776,7 @@ UnicodeString::doIndexOf(UChar c,
   if(match == NULL) {
     return -1;
   } else {
   if(match == NULL) {
     return -1;
   } else {

-    return match - fArray;
+    return (int32_t)(match - fArray);

   }
 }
 
   }
 }
 


@@ -792,7 +792,7 @@ UnicodeString::doIndexOf(UChar32 c,
   if(match == NULL) {
     return -1;
   } else {
   if(match == NULL) {
     return -1;
   } else {

-    return match - fArray;
+    return (int32_t)(match - fArray);

   }
 }
 
   }
 }
 


@@ -820,7 +820,7 @@ UnicodeString::lastIndexOf(const UChar *srcChars,
   if(match == NULL) {
     return -1;
   } else {
   if(match == NULL) {
     return -1;
   } else {

-    return match - fArray;
+    return (int32_t)(match - fArray);

   }
 }
 
   }
 }
 


@@ -841,7 +841,7 @@ UnicodeString::doLastIndexOf(UChar c,
   if(match == NULL) {
     return -1;
   } else {
   if(match == NULL) {
     return -1;
   } else {

-    return match - fArray;
+    return (int32_t)(match - fArray);

   }
 }
 
   }
 }
 


@@ -857,7 +857,7 @@ UnicodeString::doLastIndexOf(UChar32 c,
   if(match == NULL) {
     return -1;
   } else {
   if(match == NULL) {
     return -1;
   } else {

-    return match - fArray;
+    return (int32_t)(match - fArray);

   }
 }
 
   }
 }
 


@@ -1368,3 +1368,18 @@ UnicodeString::cloneArrayIfNeeded(int32_t newCapacity,
   return TRUE;
 }
 U_NAMESPACE_END
   return TRUE;
 }
 U_NAMESPACE_END

+
+#ifdef U_STATIC_IMPLEMENTATION
+/*
+This should never be called. It is defined here to make sure that the
+virtual vector deleting destructor is defined within unistr.cpp.
+The vector deleting destructor is already a part of UObject,
+but defining it here makes sure that it is included with this object file.
+This makes sure that static library dependencies are kept to a minimum.
+*/
+static void uprv_UnicodeStringDummy(void) {
+    U_NAMESPACE_USE
+    delete [] (new UnicodeString[2]);
+}
+#endif
+