Update ICU to 58.1

source/common/usc_impl.c

Index: source/common/usc_impl.c
diff --git a/source/common/usc_impl.c b/source/common/usc_impl.c
index e30c7f5ad274ad61b2f8853e36206846530c668a..1fff0c4482d7f34e8afa4950b6c086a935596e03 100644
--- a/source/common/usc_impl.c
+++ b/source/common/usc_impl.c
@@ -1,6 +1,8 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
-*   Copyright (C) 1999-2014, International Business Machines
+*   Copyright (C) 1999-2016, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *
@@ -17,8 +19,6 @@
 #include "usc_impl.h"
 #include "cmemory.h"
 
-#define ARRAY_SIZE(array) (sizeof array  / sizeof array[0])
-
 #define PAREN_STACK_DEPTH 32
 
 #define MOD(sp) ((sp) % PAREN_STACK_DEPTH)
@@ -156,7 +156,7 @@ highBit(int32_t value)
 static int32_t
 getPairIndex(UChar32 ch)
 {
-    int32_t pairedCharCount = ARRAY_SIZE(pairedChars);
+    int32_t pairedCharCount = UPRV_LENGTHOF(pairedChars);
     int32_t pairedCharPower = 1 << highBit(pairedCharCount);
     int32_t pairedCharExtra = pairedCharCount - pairedCharPower;