ICU-511.35.tar.gz

[apple/icu.git] / icuSources / common / normalizer2.cpp

diff --git a/icuSources/common/normalizer2.cpp b/icuSources/common/normalizer2.cpp
index 527731da6c42da40473c494f0f2834934d1d1632..a2c27dd1426bcb2ee8beda7b67ab11375039d7e3 100644 (file)
--- a/icuSources/common/normalizer2.cpp
+++ b/icuSources/common/normalizer2.cpp
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
 /*
 *******************************************************************************
 *

-*   Copyright (C) 2009-2011, International Business Machines
+*   Copyright (C) 2009-2012, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************


@@ -50,8 +50,6 @@ Normalizer2::getCombiningClass(UChar32 /*c*/) const {
     return 0;
 }
 
     return 0;
 }
 

-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(Normalizer2)
-

 // Normalizer2 implementation for the old UNORM_NONE.
 class NoopNormalizer2 : public Normalizer2 {
     virtual ~NoopNormalizer2();
 // Normalizer2 implementation for the old UNORM_NONE.
 class NoopNormalizer2 : public Normalizer2 {
     virtual ~NoopNormalizer2();


@@ -707,32 +705,32 @@ U_NAMESPACE_END
 
 U_NAMESPACE_USE
 
 
 U_NAMESPACE_USE
 

-U_DRAFT const UNormalizer2 * U_EXPORT2
+U_CAPI const UNormalizer2 * U_EXPORT2

 unorm2_getNFCInstance(UErrorCode *pErrorCode) {
     return (const UNormalizer2 *)Normalizer2::getNFCInstance(*pErrorCode);
 }
 
 unorm2_getNFCInstance(UErrorCode *pErrorCode) {
     return (const UNormalizer2 *)Normalizer2::getNFCInstance(*pErrorCode);
 }
 

-U_DRAFT const UNormalizer2 * U_EXPORT2
+U_CAPI const UNormalizer2 * U_EXPORT2

 unorm2_getNFDInstance(UErrorCode *pErrorCode) {
     return (const UNormalizer2 *)Normalizer2::getNFDInstance(*pErrorCode);
 }
 
 unorm2_getNFDInstance(UErrorCode *pErrorCode) {
     return (const UNormalizer2 *)Normalizer2::getNFDInstance(*pErrorCode);
 }
 

-U_DRAFT const UNormalizer2 * U_EXPORT2
+U_CAPI const UNormalizer2 * U_EXPORT2

 unorm2_getNFKCInstance(UErrorCode *pErrorCode) {
     return (const UNormalizer2 *)Normalizer2::getNFKCInstance(*pErrorCode);
 }
 
 unorm2_getNFKCInstance(UErrorCode *pErrorCode) {
     return (const UNormalizer2 *)Normalizer2::getNFKCInstance(*pErrorCode);
 }
 

-U_DRAFT const UNormalizer2 * U_EXPORT2
+U_CAPI const UNormalizer2 * U_EXPORT2

 unorm2_getNFKDInstance(UErrorCode *pErrorCode) {
     return (const UNormalizer2 *)Normalizer2::getNFKDInstance(*pErrorCode);
 }
 
 unorm2_getNFKDInstance(UErrorCode *pErrorCode) {
     return (const UNormalizer2 *)Normalizer2::getNFKDInstance(*pErrorCode);
 }
 

-U_DRAFT const UNormalizer2 * U_EXPORT2
+U_CAPI const UNormalizer2 * U_EXPORT2

 unorm2_getNFKCCasefoldInstance(UErrorCode *pErrorCode) {
     return (const UNormalizer2 *)Normalizer2::getNFKCCasefoldInstance(*pErrorCode);
 }
 
 unorm2_getNFKCCasefoldInstance(UErrorCode *pErrorCode) {
     return (const UNormalizer2 *)Normalizer2::getNFKCCasefoldInstance(*pErrorCode);
 }
 

-U_DRAFT const UNormalizer2 * U_EXPORT2
+U_CAPI const UNormalizer2 * U_EXPORT2

 unorm2_getInstance(const char *packageName,
                    const char *name,
                    UNormalization2Mode mode,
 unorm2_getInstance(const char *packageName,
                    const char *name,
                    UNormalization2Mode mode,


@@ -740,12 +738,12 @@ unorm2_getInstance(const char *packageName,
     return (const UNormalizer2 *)Normalizer2::getInstance(packageName, name, mode, *pErrorCode);
 }
 
     return (const UNormalizer2 *)Normalizer2::getInstance(packageName, name, mode, *pErrorCode);
 }
 

-U_DRAFT void U_EXPORT2
+U_CAPI void U_EXPORT2

 unorm2_close(UNormalizer2 *norm2) {
     delete (Normalizer2 *)norm2;
 }
 
 unorm2_close(UNormalizer2 *norm2) {
     delete (Normalizer2 *)norm2;
 }
 

-U_DRAFT int32_t U_EXPORT2
+U_CAPI int32_t U_EXPORT2

 unorm2_normalize(const UNormalizer2 *norm2,
                  const UChar *src, int32_t length,
                  UChar *dest, int32_t capacity,
 unorm2_normalize(const UNormalizer2 *norm2,
                  const UChar *src, int32_t length,
                  UChar *dest, int32_t capacity,


@@ -835,7 +833,7 @@ normalizeSecondAndAppend(const UNormalizer2 *norm2,
     return firstString.extract(first, firstCapacity, *pErrorCode);
 }
 
     return firstString.extract(first, firstCapacity, *pErrorCode);
 }
 

-U_DRAFT int32_t U_EXPORT2
+U_CAPI int32_t U_EXPORT2

 unorm2_normalizeSecondAndAppend(const UNormalizer2 *norm2,
                                 UChar *first, int32_t firstLength, int32_t firstCapacity,
                                 const UChar *second, int32_t secondLength,
 unorm2_normalizeSecondAndAppend(const UNormalizer2 *norm2,
                                 UChar *first, int32_t firstLength, int32_t firstCapacity,
                                 const UChar *second, int32_t secondLength,


@@ -846,7 +844,7 @@ unorm2_normalizeSecondAndAppend(const UNormalizer2 *norm2,
                                     TRUE, pErrorCode);
 }
 
                                     TRUE, pErrorCode);
 }
 

-U_DRAFT int32_t U_EXPORT2
+U_CAPI int32_t U_EXPORT2

 unorm2_append(const UNormalizer2 *norm2,
               UChar *first, int32_t firstLength, int32_t firstCapacity,
               const UChar *second, int32_t secondLength,
 unorm2_append(const UNormalizer2 *norm2,
               UChar *first, int32_t firstLength, int32_t firstCapacity,
               const UChar *second, int32_t secondLength,


@@ -857,7 +855,7 @@ unorm2_append(const UNormalizer2 *norm2,
                                     FALSE, pErrorCode);
 }
 
                                     FALSE, pErrorCode);
 }
 

-U_DRAFT int32_t U_EXPORT2
+U_CAPI int32_t U_EXPORT2

 unorm2_getDecomposition(const UNormalizer2 *norm2,
                         UChar32 c, UChar *decomposition, int32_t capacity,
                         UErrorCode *pErrorCode) {
 unorm2_getDecomposition(const UNormalizer2 *norm2,
                         UChar32 c, UChar *decomposition, int32_t capacity,
                         UErrorCode *pErrorCode) {


@@ -876,7 +874,7 @@ unorm2_getDecomposition(const UNormalizer2 *norm2,
     }
 }
 
     }
 }
 

-U_DRAFT int32_t U_EXPORT2
+U_CAPI int32_t U_EXPORT2

 unorm2_getRawDecomposition(const UNormalizer2 *norm2,
                            UChar32 c, UChar *decomposition, int32_t capacity,
                            UErrorCode *pErrorCode) {
 unorm2_getRawDecomposition(const UNormalizer2 *norm2,
                            UChar32 c, UChar *decomposition, int32_t capacity,
                            UErrorCode *pErrorCode) {


@@ -895,17 +893,17 @@ unorm2_getRawDecomposition(const UNormalizer2 *norm2,
     }
 }
 
     }
 }
 

-U_DRAFT UChar32 U_EXPORT2
+U_CAPI UChar32 U_EXPORT2

 unorm2_composePair(const UNormalizer2 *norm2, UChar32 a, UChar32 b) {
     return reinterpret_cast<const Normalizer2 *>(norm2)->composePair(a, b);
 }
 
 unorm2_composePair(const UNormalizer2 *norm2, UChar32 a, UChar32 b) {
     return reinterpret_cast<const Normalizer2 *>(norm2)->composePair(a, b);
 }
 

-U_DRAFT uint8_t U_EXPORT2
+U_CAPI uint8_t U_EXPORT2

 unorm2_getCombiningClass(const UNormalizer2 *norm2, UChar32 c) {
     return reinterpret_cast<const Normalizer2 *>(norm2)->getCombiningClass(c);
 }
 
 unorm2_getCombiningClass(const UNormalizer2 *norm2, UChar32 c) {
     return reinterpret_cast<const Normalizer2 *>(norm2)->getCombiningClass(c);
 }
 

-U_DRAFT UBool U_EXPORT2
+U_CAPI UBool U_EXPORT2

 unorm2_isNormalized(const UNormalizer2 *norm2,
                     const UChar *s, int32_t length,
                     UErrorCode *pErrorCode) {
 unorm2_isNormalized(const UNormalizer2 *norm2,
                     const UChar *s, int32_t length,
                     UErrorCode *pErrorCode) {


@@ -920,7 +918,7 @@ unorm2_isNormalized(const UNormalizer2 *norm2,
     return ((const Normalizer2 *)norm2)->isNormalized(sString, *pErrorCode);
 }
 
     return ((const Normalizer2 *)norm2)->isNormalized(sString, *pErrorCode);
 }
 

-U_DRAFT UNormalizationCheckResult U_EXPORT2
+U_CAPI UNormalizationCheckResult U_EXPORT2

 unorm2_quickCheck(const UNormalizer2 *norm2,
                   const UChar *s, int32_t length,
                   UErrorCode *pErrorCode) {
 unorm2_quickCheck(const UNormalizer2 *norm2,
                   const UChar *s, int32_t length,
                   UErrorCode *pErrorCode) {


@@ -935,7 +933,7 @@ unorm2_quickCheck(const UNormalizer2 *norm2,
     return ((const Normalizer2 *)norm2)->quickCheck(sString, *pErrorCode);
 }
 
     return ((const Normalizer2 *)norm2)->quickCheck(sString, *pErrorCode);
 }
 

-U_DRAFT int32_t U_EXPORT2
+U_CAPI int32_t U_EXPORT2

 unorm2_spanQuickCheckYes(const UNormalizer2 *norm2,
                          const UChar *s, int32_t length,
                          UErrorCode *pErrorCode) {
 unorm2_spanQuickCheckYes(const UNormalizer2 *norm2,
                          const UChar *s, int32_t length,
                          UErrorCode *pErrorCode) {


@@ -950,17 +948,17 @@ unorm2_spanQuickCheckYes(const UNormalizer2 *norm2,
     return ((const Normalizer2 *)norm2)->spanQuickCheckYes(sString, *pErrorCode);
 }
 
     return ((const Normalizer2 *)norm2)->spanQuickCheckYes(sString, *pErrorCode);
 }
 

-U_DRAFT UBool U_EXPORT2
+U_CAPI UBool U_EXPORT2

 unorm2_hasBoundaryBefore(const UNormalizer2 *norm2, UChar32 c) {
     return ((const Normalizer2 *)norm2)->hasBoundaryBefore(c);
 }
 
 unorm2_hasBoundaryBefore(const UNormalizer2 *norm2, UChar32 c) {
     return ((const Normalizer2 *)norm2)->hasBoundaryBefore(c);
 }
 

-U_DRAFT UBool U_EXPORT2
+U_CAPI UBool U_EXPORT2

 unorm2_hasBoundaryAfter(const UNormalizer2 *norm2, UChar32 c) {
     return ((const Normalizer2 *)norm2)->hasBoundaryAfter(c);
 }
 
 unorm2_hasBoundaryAfter(const UNormalizer2 *norm2, UChar32 c) {
     return ((const Normalizer2 *)norm2)->hasBoundaryAfter(c);
 }
 

-U_DRAFT UBool U_EXPORT2
+U_CAPI UBool U_EXPORT2

 unorm2_isInert(const UNormalizer2 *norm2, UChar32 c) {
     return ((const Normalizer2 *)norm2)->isInert(c);
 }
 unorm2_isInert(const UNormalizer2 *norm2, UChar32 c) {
     return ((const Normalizer2 *)norm2)->isInert(c);
 }