From 4d0381063f2c67f9cfe9bb8e10384c2082aaf823 Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Sun, 1 Apr 2018 20:44:40 +0000 Subject: [PATCH] ICU-13194 rbbi work, revert unneeded changes to UVector. X-SVN-Rev: 41185 --- icu4c/source/common/uvector.cpp | 2 +- icu4c/source/common/uvectr32.cpp | 12 ++---------- icu4c/source/common/uvectr32.h | 5 ----- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/icu4c/source/common/uvector.cpp b/icu4c/source/common/uvector.cpp index 4088855b7a3..cf19edf646f 100644 --- a/icu4c/source/common/uvector.cpp +++ b/icu4c/source/common/uvector.cpp @@ -518,7 +518,7 @@ sortiComparator(const void * /*context */, const void *left, const void *right) } /** - * Sort the vector, assuming it contains ints. + * Sort the vector, assuming it constains ints. * (A more general sort would take a comparison function, but it's * not clear whether UVector's UElementComparator or * UComparator from uprv_sortAray would be more appropriate.) diff --git a/icu4c/source/common/uvectr32.cpp b/icu4c/source/common/uvectr32.cpp index 484777885ee..d1ae6599585 100644 --- a/icu4c/source/common/uvectr32.cpp +++ b/icu4c/source/common/uvectr32.cpp @@ -13,7 +13,6 @@ #include "uvectr32.h" #include "cmemory.h" #include "putilimp.h" -#include "uarrsort.h" U_NAMESPACE_BEGIN @@ -329,15 +328,8 @@ void UVector32::sortedInsert(int32_t tok, UErrorCode& ec) { } -/** - * Sort the vector, assuming it contains ints. - */ -void UVector32::sorti(UErrorCode &ec) { - if (U_SUCCESS(ec)) { - uprv_sortArray(elements, count, sizeof(int32_t), - uprv_int32Comparator, nullptr, false, &ec); - } -} + + U_NAMESPACE_END diff --git a/icu4c/source/common/uvectr32.h b/icu4c/source/common/uvectr32.h index 7efd767ae28..9112d9fe4aa 100644 --- a/icu4c/source/common/uvectr32.h +++ b/icu4c/source/common/uvectr32.h @@ -160,11 +160,6 @@ public: */ void sortedInsert(int32_t elem, UErrorCode& ec); - /** - * Sort the contents of the int32_t vector. - */ - void sorti(UErrorCode &ec); - /** * Returns a pointer to the internal array holding the vector. */