ICU 56 update step 1

source/i18n/collationtailoring.cpp

 /*
 *******************************************************************************
-* Copyright (C) 2013-2014, International Business Machines
+* Copyright (C) 2013-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 *******************************************************************************
 * collationtailoring.cpp
 *
 * created on: 2013mar12
 * created by: Markus W. Scherer
 */
 
 #include "unicode/utypes.h"
 
@@ skipping 19 matching lines @@
 CollationTailoring::CollationTailoring(const CollationSettings *baseSettings)
         : data(NULL), settings(baseSettings),
           actualLocale(""),
           ownedData(NULL),
           builder(NULL), memory(NULL), bundle(NULL),
           trie(NULL), unsafeBackwardSet(NULL),
           maxExpansions(NULL) {
     if(baseSettings != NULL) {
         U_ASSERT(baseSettings->reorderCodesLength == 0);
         U_ASSERT(baseSettings->reorderTable == NULL);
+        U_ASSERT(baseSettings->minHighNoReorder == 0);
     } else {
         settings = new CollationSettings();
     }
     if(settings != NULL) {
         settings->addRef();
     }
     rules.getTerminatedBuffer();  // ensure NUL-termination
     version[0] = version[1] = version[2] = version[3] = 0;
     maxExpansionsInitOnce.reset();
 }
@@ skipping 48 matching lines @@
     return ((int32_t)version[1] << 4) | (version[2] >> 6);
 }
 
 CollationCacheEntry::~CollationCacheEntry() {
     SharedObject::clearPtr(tailoring);
 }
 
 U_NAMESPACE_END
 
 #endif  // !UCONFIG_NO_COLLATION