ICU 56 update step 1

source/i18n/collation.h

Index: source/i18n/collation.h
diff --git a/source/i18n/collation.h b/source/i18n/collation.h
index 3d2ea8c6a1c9a5839a154a31ba658a0f97fe373a..53cffa983c1faedafa54ad679f02cb7545e8e20d 100644
--- a/source/i18n/collation.h
+++ b/source/i18n/collation.h
@@ -1,6 +1,6 @@
 /*
 *******************************************************************************
-* Copyright (C) 2010-2014, International Business Machines
+* Copyright (C) 2010-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 *******************************************************************************
 * collation.h
@@ -29,17 +29,19 @@ public:
     // Special sort key bytes for all levels.
     static const uint8_t TERMINATOR_BYTE = 0;
     static const uint8_t LEVEL_SEPARATOR_BYTE = 1;
+
+    /** The secondary/tertiary lower limit for tailoring before any root elements. */
+    static const uint32_t BEFORE_WEIGHT16 = 0x0100;
+
     /**
      * Merge-sort-key separator.
-     * Must not be used as the lead byte of any CE weight,
-     * nor as primary compression low terminator.
+     * Same as the unique primary and identical-level weights of U+FFFE.
+     * Must not be used as primary compression low terminator.
      * Otherwise usable.
      */
     static const uint8_t MERGE_SEPARATOR_BYTE = 2;
     static const uint32_t MERGE_SEPARATOR_PRIMARY = 0x02000000;  // U+FFFE
-    static const uint32_t MERGE_SEPARATOR_WEIGHT16 = 0x0200;  // U+FFFE
-    static const uint32_t MERGE_SEPARATOR_LOWER32 = 0x02000200;  // U+FFFE
-    static const uint32_t MERGE_SEPARATOR_CE32 = 0x02000202;  // U+FFFE
+    static const uint32_t MERGE_SEPARATOR_CE32 = 0x02000505;  // U+FFFE
 
     /**
      * Primary compression low terminator, must be greater than MERGE_SEPARATOR_BYTE.
@@ -486,10 +488,6 @@ public:
         return makeCE(unassignedPrimaryFromCodePoint(c));
     }
 
-    static inline uint32_t reorder(const uint8_t reorderTable[256], uint32_t primary) {
-        return ((uint32_t)reorderTable[primary >> 24] << 24) | (primary & 0xffffff);
-    }
-
 private:
     Collation();  // No instantiation.
 };