From 4d4cde52ca1388a266ef496cd797f1cb797fed20 Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Wed, 17 Jul 2002 19:44:00 +0000
Subject: [PATCH] ICU-1913 Fixes for iSeries.

X-SVN-Rev: 9235
---
 icu4c/source/common/uvector.cpp | 23 ++++++++++++++++++-----
 icu4c/source/common/uvector.h   |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/icu4c/source/common/uvector.cpp b/icu4c/source/common/uvector.cpp
index 9373ae2459..584ce4afe8 100644
--- a/icu4c/source/common/uvector.cpp
+++ b/icu4c/source/common/uvector.cpp
@@ -15,6 +15,14 @@ U_NAMESPACE_BEGIN
 
 #define DEFUALT_CAPACITY 8
 
+/*
+ * Constants for hinting whether a key is an integer
+ * or a pointer.  If a hint bit is zero, then the associated
+ * token is assumed to be an integer. This is needed for iSeries
+ */
+#define HINT_KEY_POINTER   (1)
+#define HINT_KEY_INTEGER   (2)
+ 
 const char UVector::fgClassID=0;
 
 UVector::UVector(UErrorCode &status) :
@@ -261,17 +269,17 @@ UBool   UVector::equals(const UVector &other) const {
 int32_t UVector::indexOf(void* obj, int32_t startIndex) const {
     UHashTok key;
     key.pointer = obj;
-    return indexOf(key, startIndex);
+    return indexOf(key, startIndex, HINT_KEY_POINTER);
 }
 
 int32_t UVector::indexOf(int32_t obj, int32_t startIndex) const {
     UHashTok key;
     key.integer = obj;
-    return indexOf(key, startIndex);
+    return indexOf(key, startIndex, HINT_KEY_INTEGER);
 }
 
 // This only works if this object has a non-null comparer
-int32_t UVector::indexOf(UHashTok key, int32_t startIndex) const {
+int32_t UVector::indexOf(UHashTok key, int32_t startIndex, int8_t hint) const {
     int32_t i;
     if (comparer != 0) {
         for (i=startIndex; i<count; ++i) {
@@ -281,8 +289,13 @@ int32_t UVector::indexOf(UHashTok key, int32_t startIndex) const {
         }
     } else {
         for (i=startIndex; i<count; ++i) {
-            if (key.pointer == elements[i].pointer) {
-                return i;
+            /* Pointers are not always the same size as ints so to perform
+             * a valid comparision we need to know whether we are being
+             * provided an int or a pointer. */
+            if (((hint & HINT_KEY_POINTER) && (key.pointer == elements[i].pointer))
+                || (key.integer == elements[i].integer))
+            {
+                    return i;
             }
         }
     }
diff --git a/icu4c/source/common/uvector.h b/icu4c/source/common/uvector.h
index bf59306991..889e324389 100644
--- a/icu4c/source/common/uvector.h
+++ b/icu4c/source/common/uvector.h
@@ -260,7 +260,7 @@ public:
 private:
     void _init(int32_t initialCapacity, UErrorCode &status);
 
-    int32_t indexOf(UHashTok key, int32_t startIndex = 0) const;
+    int32_t indexOf(UHashTok key, int32_t startIndex = 0, int8_t hint = 0) const;
 
     void sortedInsert(UHashTok tok, USortComparator compare, UErrorCode& ec);