ICU-62123.0.1.tar.gz

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

diff --git a/icuSources/common/ucharstriebuilder.cpp b/icuSources/common/ucharstriebuilder.cpp
index b304a3b42c3015c1f4acb5038b9dd61b93300331..049997a27545ed7fccb311a70c754d6f78e588fc 100644 (file)
--- a/icuSources/common/ucharstriebuilder.cpp
+++ b/icuSources/common/ucharstriebuilder.cpp
@@ -1,10 +1,12 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 *******************************************************************************
 /*
 *******************************************************************************

-*   Copyright (C) 2010-2011, International Business Machines
+*   Copyright (C) 2010-2012, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  ucharstriebuilder.h
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  ucharstriebuilder.h

-*   encoding:   US-ASCII
+*   encoding:   UTF-8

 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   tab size:   8 (not used)
 *   indentation:4
 *


@@ -115,7 +117,7 @@ UCharsTrieBuilder::add(const UnicodeString &s, int32_t value, UErrorCode &errorC
             return *this;
         }
         if(elementsLength>0) {
             return *this;
         }
         if(elementsLength>0) {

-            uprv_memcpy(newElements, elements, elementsLength*sizeof(UCharsTrieElement));
+            uprv_memcpy(newElements, elements, (size_t)elementsLength*sizeof(UCharsTrieElement));

         }
         delete[] elements;
         elements=newElements;
         }
         delete[] elements;
         elements=newElements;


@@ -132,9 +134,9 @@ U_CDECL_BEGIN
 
 static int32_t U_CALLCONV
 compareElementStrings(const void *context, const void *left, const void *right) {
 
 static int32_t U_CALLCONV
 compareElementStrings(const void *context, const void *left, const void *right) {

-    const UnicodeString *strings=reinterpret_cast<const UnicodeString *>(context);
-    const UCharsTrieElement *leftElement=reinterpret_cast<const UCharsTrieElement *>(left);
-    const UCharsTrieElement *rightElement=reinterpret_cast<const UCharsTrieElement *>(right);
+    const UnicodeString *strings=static_cast<const UnicodeString *>(context);
+    const UCharsTrieElement *leftElement=static_cast<const UCharsTrieElement *>(left);
+    const UCharsTrieElement *rightElement=static_cast<const UCharsTrieElement *>(right);

     return leftElement->compareStringTo(*rightElement, *strings);
 }
 
     return leftElement->compareStringTo(*rightElement, *strings);
 }
 


@@ -210,7 +212,7 @@ UCharsTrieBuilder::buildUChars(UStringTrieBuildOption buildOption, UErrorCode &e
     }
     if(ucharsCapacity<capacity) {
         uprv_free(uchars);
     }
     if(ucharsCapacity<capacity) {
         uprv_free(uchars);

-        uchars=reinterpret_cast<UChar *>(uprv_malloc(capacity*2));
+        uchars=static_cast<UChar *>(uprv_malloc(capacity*2));

         if(uchars==NULL) {
             errorCode=U_MEMORY_ALLOCATION_ERROR;
             ucharsCapacity=0;
         if(uchars==NULL) {
             errorCode=U_MEMORY_ALLOCATION_ERROR;
             ucharsCapacity=0;


@@ -285,7 +287,7 @@ UCharsTrieBuilder::indexOfElementWithNextUnit(int32_t i, int32_t unitIndex, UCha
 
 UCharsTrieBuilder::UCTLinearMatchNode::UCTLinearMatchNode(const UChar *units, int32_t len, Node *nextNode)
         : LinearMatchNode(len, nextNode), s(units) {
 
 UCharsTrieBuilder::UCTLinearMatchNode::UCTLinearMatchNode(const UChar *units, int32_t len, Node *nextNode)
         : LinearMatchNode(len, nextNode), s(units) {

-    hash=hash*37+ustr_hashUCharsN(units, len);
+    hash=hash*37u+ustr_hashUCharsN(units, len);

 }
 
 UBool
 }
 
 UBool


@@ -327,7 +329,7 @@ UCharsTrieBuilder::ensureCapacity(int32_t length) {
         do {
             newCapacity*=2;
         } while(newCapacity<=length);
         do {
             newCapacity*=2;
         } while(newCapacity<=length);

-        UChar *newUChars=reinterpret_cast<UChar *>(uprv_malloc(newCapacity*2));
+        UChar *newUChars=static_cast<UChar *>(uprv_malloc(newCapacity*2));

         if(newUChars==NULL) {
             // unable to allocate memory
             uprv_free(uchars);
         if(newUChars==NULL) {
             // unable to allocate memory
             uprv_free(uchars);


@@ -378,7 +380,7 @@ UCharsTrieBuilder::writeValueAndFinal(int32_t i, UBool isFinal) {
     int32_t length;
     if(i<0 || i>UCharsTrie::kMaxTwoUnitValue) {
         intUnits[0]=(UChar)(UCharsTrie::kThreeUnitValueLead);
     int32_t length;
     if(i<0 || i>UCharsTrie::kMaxTwoUnitValue) {
         intUnits[0]=(UChar)(UCharsTrie::kThreeUnitValueLead);

-        intUnits[1]=(UChar)(i>>16);
+        intUnits[1]=(UChar)((uint32_t)i>>16);

         intUnits[2]=(UChar)i;
         length=3;
     // } else if(i<=UCharsTrie::kMaxOneUnitValue) {
         intUnits[2]=(UChar)i;
         length=3;
     // } else if(i<=UCharsTrie::kMaxOneUnitValue) {


@@ -402,7 +404,7 @@ UCharsTrieBuilder::writeValueAndType(UBool hasValue, int32_t value, int32_t node
     int32_t length;
     if(value<0 || value>UCharsTrie::kMaxTwoUnitNodeValue) {
         intUnits[0]=(UChar)(UCharsTrie::kThreeUnitNodeValueLead);
     int32_t length;
     if(value<0 || value>UCharsTrie::kMaxTwoUnitNodeValue) {
         intUnits[0]=(UChar)(UCharsTrie::kThreeUnitNodeValueLead);

-        intUnits[1]=(UChar)(value>>16);
+        intUnits[1]=(UChar)((uint32_t)value>>16);

         intUnits[2]=(UChar)value;
         length=3;
     } else if(value<=UCharsTrie::kMaxOneUnitNodeValue) {
         intUnits[2]=(UChar)value;
         length=3;
     } else if(value<=UCharsTrie::kMaxOneUnitNodeValue) {