Update ICU to 54.1 step 1

source/common/unicode/uniset.h

 /*
 ***************************************************************************
-* Copyright (C) 1999-2013, International Business Machines Corporation
+* Copyright (C) 1999-2014, International Business Machines Corporation
 * and others. All Rights Reserved.
 ***************************************************************************
 *   Date        Name        Description
 *   10/20/99    alan        Creation.
 ***************************************************************************
 */
 
 #ifndef UNICODESET_H
 #define UNICODESET_H
 
 #include "unicode/unifilt.h"
 #include "unicode/unistr.h"
 #include "unicode/uset.h"
 
 /**
  * \file
  * \brief C++ API: Unicode Set
  */
 
 U_NAMESPACE_BEGIN
 
 // Forward Declarations.
-void UnicodeSet_initInclusion(int32_t src, UErrorCode &status); /**< @internal */
+void U_CALLCONV UnicodeSet_initInclusion(int32_t src, UErrorCode &status); /**< @internal */
 
 class BMPSet;
 class ParsePosition;
 class RBBIRuleScanner;
 class SymbolTable;
 class UnicodeSetStringSpan;
 class UVector;
 class RuleCharacterIterator;
 
 /**
@@ skipping 229 matching lines @@
  *   there are usually very few opportunities for failure other than a shortage
  *   of memory, error codes in low-level C++ string methods would be inconvenient,
  *   and the error code as the last parameter (ICU convention) would prevent
  *   the use of default parameter values.
  *   Instead, such methods set the UnicodeSet into a "bogus" state
  *   (see isBogus()) if an error occurs.
  *
  * @author Alan Liu
  * @stable ICU 2.0
  */
-class U_COMMON_API UnicodeSet : public UnicodeFilter {
+class U_COMMON_API UnicodeSet U_FINAL : public UnicodeFilter {
 
     int32_t len; // length of list used; 0 <= len <= capacity
     int32_t capacity; // capacity of list
     UChar32* list; // MUST be terminated with HIGH
     BMPSet *bmpSet; // The set is frozen iff either bmpSet or stringSpan is not NULL.
     UChar32* buffer; // internal buffer, may be NULL
     int32_t bufferCapacity; // capacity of buffer
     int32_t patLen;
 
     /**
@@ skipping 1295 matching lines @@
      * @return a reference to this.
      */
     UnicodeSet& applyPropertyPattern(const UnicodeString& pattern,
                                      ParsePosition& ppos,
                                      UErrorCode &ec);
 
     void applyPropertyPattern(RuleCharacterIterator& chars,
                               UnicodeString& rebuiltPat,
                               UErrorCode& ec);
 
-    friend void UnicodeSet_initInclusion(int32_t src, UErrorCode &status);
+    friend void U_CALLCONV UnicodeSet_initInclusion(int32_t src, UErrorCode &status);
     static const UnicodeSet* getInclusions(int32_t src, UErrorCode &status);
 
     /**
      * A filter that returns TRUE if the given code point should be
      * included in the UnicodeSet being constructed.
      */
     typedef UBool (*Filter)(UChar32 codePoint, void* context);
 
     /**
      * Given a filter, set this UnicodeSet to the code points
@@ skipping 79 matching lines @@
         limit=0;
     } else if(limit>sLength) {
         limit=sLength;
     }
     return spanBack(s.getBuffer(), limit, spanCondition);
 }
 
 U_NAMESPACE_END
 
 #endif