Update ICU to 58.1

source/i18n/uspoof_conf.h

Index: source/i18n/uspoof_conf.h
diff --git a/source/i18n/uspoof_conf.h b/source/i18n/uspoof_conf.h
index b2be5d0388ea07e5fee48b303e19fa30081d605f..bc5e4a909fa0c79692c9d692527ffbc56af9eaf9 100644
--- a/source/i18n/uspoof_conf.h
+++ b/source/i18n/uspoof_conf.h
@@ -1,7 +1,9 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 ******************************************************************************
 *
-*   Copyright (C) 2008-2011, International Business Machines
+*   Copyright (C) 2008-2016, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
@@ -23,6 +25,8 @@
 
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS 
 
+#include "unicode/uregex.h"
+#include "uhash.h"
 #include "uspoof_impl.h"
 
 U_NAMESPACE_BEGIN
@@ -34,9 +38,9 @@ U_NAMESPACE_BEGIN
 
 struct SPUString : public UMemory {
     UnicodeString  *fStr;             // The actual string.
-    int32_t         fStrTableIndex;   // Index into the final runtime data for this string.
-                                      //  (or, for length 1, the single string char itself,
-                                      //   there being no string table entry for it.)
+    int32_t         fCharOrStrTableIndex;   // Index into the final runtime data for this
+                                      // string (or, for length 1, the single string char
+                                      // itself, there being no string table entry for it.)
     SPUString(UnicodeString *s);
     ~SPUString();
 };
@@ -84,10 +88,7 @@ class ConfusabledataBuilder : public UMemory {
   private:
     SpoofImpl  *fSpoofImpl;
     UChar      *fInput;
-    UHashtable *fSLTable;
-    UHashtable *fSATable; 
-    UHashtable *fMLTable; 
-    UHashtable *fMATable;
+    UHashtable *fTable;
     UnicodeSet *fKeySet;     // A set of all keys (UChar32s) that go into the four mapping tables.
 
     // The binary data is first assembled into the following four collections, then
@@ -95,7 +96,6 @@ class ConfusabledataBuilder : public UMemory {
     UVector            *fKeyVec;
     UVector            *fValueVec;
     UnicodeString      *fStringTable;
-    UVector            *fStringLengthsTable;
     
     SPUStringPool      *stringPool;
     URegularExpression *fParseLine;