ICU 56 update step 1

source/i18n/collation.cpp

 /*
 *******************************************************************************
 * Copyright (C) 2010-2014, International Business Machines
 * Corporation and others.  All Rights Reserved.
 *******************************************************************************
 * collation.cpp
 *
 * created on: 2010oct27
 * created by: Markus W. Scherer
 */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_COLLATION
 
 #include "collation.h"
 #include "uassert.h"
 
 U_NAMESPACE_BEGIN
 
 // Some compilers don't care if constants are defined in the .cpp file.
 // MS Visual C++ does not like it, but gcc requires it. clang does not care.
 #ifndef _MSC_VER
+const uint8_t Collation::LEVEL_SEPARATOR_BYTE;
+const uint8_t Collation::MERGE_SEPARATOR_BYTE;
 const uint32_t Collation::ONLY_TERTIARY_MASK;
 const uint32_t Collation::CASE_AND_TERTIARY_MASK;
 #endif
 
 uint32_t
 Collation::incTwoBytePrimaryByOffset(uint32_t basePrimary, UBool isCompressible, int32_t offset) {
     // Extract the second byte, minus the minimum byte value,
     // plus the offset, modulo the number of usable byte values, plus the minimum.
     // Reserve the PRIMARY_COMPRESSION_LOW_BYTE and high byte if necessary.
     uint32_t primary;
@@ skipping 103 matching lines @@
     c /= 254;
     // Second byte: 251 values 04..FE excluding the primary compression bytes.
     primary |= (4 + (c % 251)) << 16;
     // One lead byte covers all code points (c < 0x1182B4 = 1*251*254*18).
     return primary | (UNASSIGNED_IMPLICIT_BYTE << 24);
 }
 
 U_NAMESPACE_END
 
 #endif  // !UCONFIG_NO_COLLATION