ICU-64232.0.1.tar.gz

[apple/icu.git] / icuSources / tools / gennorm2 / norms.h

diff --git a/icuSources/tools/gennorm2/norms.h b/icuSources/tools/gennorm2/norms.h
index 4bf6e760e202c00959ee76cb2d27cac4d9e88a93..5684e65e67298770274bbb0fea6eb1ae6a85c2e5 100644 (file)
--- a/icuSources/tools/gennorm2/norms.h
+++ b/icuSources/tools/gennorm2/norms.h
@@ -15,12 +15,12 @@
 #if !UCONFIG_NO_NORMALIZATION
 
 #include "unicode/errorcode.h"
 #if !UCONFIG_NO_NORMALIZATION
 
 #include "unicode/errorcode.h"

+#include "unicode/umutablecptrie.h"

 #include "unicode/uniset.h"
 #include "unicode/unistr.h"
 #include "unicode/utf16.h"
 #include "normalizer2impl.h"
 #include "toolutil.h"
 #include "unicode/uniset.h"
 #include "unicode/unistr.h"
 #include "unicode/utf16.h"
 #include "normalizer2impl.h"
 #include "toolutil.h"

-#include "utrie2.h"

 #include "uvectr32.h"
 
 U_NAMESPACE_BEGIN
 #include "uvectr32.h"
 
 U_NAMESPACE_BEGIN


@@ -176,8 +176,6 @@ public:
         virtual ~Enumerator();
         /** Called for enumerated value!=0. */
         virtual void rangeHandler(UChar32 start, UChar32 end, Norm &norm) = 0;
         virtual ~Enumerator();
         /** Called for enumerated value!=0. */
         virtual void rangeHandler(UChar32 start, UChar32 end, Norm &norm) = 0;

-        /** @internal Public only for C callback. */
-        UBool rangeHandler(UChar32 start, UChar32 end, uint32_t value);

     protected:
         Norms &norms;
     };
     protected:
         Norms &norms;
     };


@@ -190,7 +188,7 @@ private:
     Norms(const Norms &other) = delete;
     Norms &operator=(const Norms &other) = delete;
 
     Norms(const Norms &other) = delete;
     Norms &operator=(const Norms &other) = delete;
 

-    UTrie2 *normTrie;
+    UMutableCPTrie *normTrie;

     UToolMemory *normMem;
     Norm *norms;
 };
     UToolMemory *normMem;
     Norm *norms;
 };