Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / icu / source / i18n / dtptngen_impl.h

diff --git a/src/third_party/icu/source/i18n/dtptngen_impl.h b/src/third_party/icu/source/i18n/dtptngen_impl.h
index 25afef8..4826d5a 100644 (file)
--- a/src/third_party/icu/source/i18n/dtptngen_impl.h
+++ b/src/third_party/icu/source/i18n/dtptngen_impl.h
@@ -1,6 +1,6 @@
 /*
 *******************************************************************************
-* Copyright (C) 2007-2009, International Business Machines Corporation and
+* Copyright (C) 2007-2013, International Business Machines Corporation and
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 *
@@ -44,6 +44,7 @@
 #define CAP_F             ((UChar)0x0046)
 #define CAP_G             ((UChar)0x0047)
 #define CAP_H             ((UChar)0x0048)
+#define CAP_J             ((UChar)0x004A)
 #define CAP_K             ((UChar)0x004B)
 #define CAP_L             ((UChar)0x004C)
 #define CAP_M             ((UChar)0x004D)
@@ -51,8 +52,10 @@
 #define CAP_Q             ((UChar)0x0051)
 #define CAP_S             ((UChar)0x0053)
 #define CAP_T             ((UChar)0x0054)
+#define CAP_U             ((UChar)0x0055)
 #define CAP_V             ((UChar)0x0056)
 #define CAP_W             ((UChar)0x0057)
+#define CAP_X             ((UChar)0x0058)
 #define CAP_Y             ((UChar)0x0059)
 #define CAP_Z             ((UChar)0x005A)
 #define LOWLINE           ((UChar)0x005F)
@@ -78,6 +81,7 @@
 #define LOW_U             ((UChar)0x0075)
 #define LOW_V             ((UChar)0x0076)
 #define LOW_W             ((UChar)0x0077)
+#define LOW_X             ((UChar)0x0078)
 #define LOW_Y             ((UChar)0x0079)
 #define LOW_Z             ((UChar)0x007A)
 #define DT_SHORT          -0x102
@@ -143,7 +147,7 @@ public:
     void set(const UnicodeString& patternString);
     UBool isQuoteLiteral(const UnicodeString& s) const;
     void getQuoteLiteral(UnicodeString& quote, int32_t *itemIndex);
-    int32_t getCanonicalIndex(const UnicodeString& s) { return getCanonicalIndex(s, TRUE); };
+    int32_t getCanonicalIndex(const UnicodeString& s) { return getCanonicalIndex(s, TRUE); }
     int32_t getCanonicalIndex(const UnicodeString& s, UBool strict);
     UBool isPatternSeparator(UnicodeString& field);
     void setFilter(UErrorCode &status);
@@ -165,12 +169,12 @@ public:
     int32_t missingFieldMask;
     int32_t extraFieldMask;
 
-    DistanceInfo() {};
-    virtual ~DistanceInfo() {};
-    void clear() { missingFieldMask = extraFieldMask = 0; };
+    DistanceInfo() {}
+    virtual ~DistanceInfo();
+    void clear() { missingFieldMask = extraFieldMask = 0; }
     void setTo(DistanceInfo& other);
-    void addMissing(int32_t field) { missingFieldMask |= (1<<field); };
-    void addExtra(int32_t field) { extraFieldMask |= (1<<field); };
+    void addMissing(int32_t field) { missingFieldMask |= (1<<field); }
+    void addExtra(int32_t field) { extraFieldMask |= (1<<field); }
 };
 
 class DateTimeMatcher: public UMemory {
@@ -188,7 +192,7 @@ public:
     int32_t getDistance(const DateTimeMatcher& other, int32_t includeMask, DistanceInfo& distanceInfo);
     DateTimeMatcher();
     DateTimeMatcher(const DateTimeMatcher& other);
-    virtual ~DateTimeMatcher() {};
+    virtual ~DateTimeMatcher();
     int32_t getFieldMask();
 };