ICU-59117.0.1.tar.gz

[apple/icu.git] / icuSources / test / intltest / uvectest.cpp

diff --git a/icuSources/test/intltest/uvectest.cpp b/icuSources/test/intltest/uvectest.cpp
index 98b2f38c021a6bb479ed4f0a229afc2fe29dbd0c..4b73b566ad3bb0b7840f7a6aeb1ef3c335606f28 100644 (file)
--- a/icuSources/test/intltest/uvectest.cpp
+++ b/icuSources/test/intltest/uvectest.cpp
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 2004-2010, International Business Machines Corporation and
+ * Copyright (c) 2004-2011, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
@@ -9,10 +11,10 @@
 #include "intltest.h"
 
 #include "uvectest.h"
-#include "uvector.h"
-#include "hash.h"
-
 #include "cstring.h"
+#include "hash.h"
+#include "uelement.h"
+#include "uvector.h"
 
 //---------------------------------------------------------------------------
 //
@@ -67,7 +69,7 @@ void UVectorTest::runIndexedTest( int32_t index, UBool exec, const char* &name,
     }
 
 static int8_t U_CALLCONV
-UVectorTest_compareInt32(UHashTok key1, UHashTok key2) {
+UVectorTest_compareInt32(UElement key1, UElement key2) {
     if (key1.integer > key2.integer) {
         return 1;
     }
@@ -79,7 +81,7 @@ UVectorTest_compareInt32(UHashTok key1, UHashTok key2) {
 
 U_CDECL_BEGIN
 static int8_t U_CALLCONV
-UVectorTest_compareCstrings(const UHashTok key1, const UHashTok key2) {
+UVectorTest_compareCstrings(const UElement key1, const UElement key2) {
     return !strcmp((const char *)key1.pointer, (const char *)key2.pointer);
 }
 U_CDECL_END
@@ -161,7 +163,7 @@ void UVectorTest::UStack_API() {
 }
 
 U_CDECL_BEGIN
-static UBool U_CALLCONV neverTRUE(const UHashTok /*key1*/, const UHashTok /*key2*/) {
+static UBool U_CALLCONV neverTRUE(const UElement /*key1*/, const UElement /*key2*/) {
     return FALSE;
 }