Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: source/common/unicode/uniset.h

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/common/unicode/umachine.h ('k') | source/common/unicode/urename.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/unicode/uniset.h
diff --git a/source/common/unicode/uniset.h b/source/common/unicode/uniset.h
index a959fb971ba68df18abd85617e87b81b57f904c4..237ebf766c365cdb9f0ec052aebb43fbd462d436 100644
--- a/source/common/unicode/uniset.h
+++ b/source/common/unicode/uniset.h
@@ -1,6 +1,6 @@
/*
***************************************************************************
-* Copyright (C) 1999-2013, International Business Machines Corporation
+* Copyright (C) 1999-2014, International Business Machines Corporation
* and others. All Rights Reserved.
***************************************************************************
* Date Name Description
@@ -23,7 +23,7 @@
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;
@@ -273,7 +273,7 @@ class RuleCharacterIterator;
* @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
@@ -1589,7 +1589,7 @@ private:
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);
/**
« no previous file with comments | « source/common/unicode/umachine.h ('k') | source/common/unicode/urename.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698