AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-8680 require C++ namespace, replace most U_NAMESPACE_QUALIFIER with icu::, remove still-draft U_STD_NS, U_STD_NSQ, and U_STD_NS_USE

Browse Source 
X-SVN-Rev: 30281
This commit is contained in:
Markus Scherer 2011-07-06 04:03:35 +00:00
parent fc8eeb8f66
commit 1beb0f1e4f
59 changed files with 166 additions and 777 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
icu4c/readme.html
View File

@ -3,7 +3,7 @@
<html lang="en-US" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
<title>ReadMe for ICU 4.8.1</title>
<title>ReadMe for ICU 49</title>
<meta name="COPYRIGHT" content=
"Copyright (c) 1997-2011 IBM Corporation and others. All Rights Reserved." />
<meta name="KEYWORDS" content=
@ -16,7 +16,7 @@
<body class="draft">
<h1>International Components for Unicode<br />
<abbr title="International Components for Unicode">ICU</abbr> 4.8.1 ReadMe</h1>
<abbr title="International Components for Unicode">ICU</abbr> 49 ReadMe</h1>
<p>Last updated: 2011-June-24<br />
Copyright &copy; 1997-2011 International Business Machines Corporation and
@ -225,6 +225,11 @@
time zone ID (but still offset 0 and no daylight saving time) for the case. Existing software checking
the returned time zone ID to validate the input ID may need to be updated to support the new behavior.</p>
<h3>C++ namespace support required</h3>
<p>ICU4C 49 requires C++ namespace support.
As a result, for example, rather than <code>U_NAMESPACE_QUALIFIER UnicodeString</code>
you can now simply write <code>icu::UnicodeString</code>.</p>
<h2><a name="Download" href="#Download" id="Download">How To Download the
Source Code</a></h2>

8
icu4c/source/common/brkeng.cpp
View File

@ -1,7 +1,7 @@
/**
/*
************************************************************************************
* Copyright (C) 2006-2009,2011, International Business Machines Corporation *
* and others. All Rights Reserved. *
* Copyright (C) 2006-2011, International Business Machines Corporation
* and others. All Rights Reserved.
************************************************************************************
*/
@ -130,7 +130,7 @@ ICULanguageBreakFactory::~ICULanguageBreakFactory() {
U_NAMESPACE_END
U_CDECL_BEGIN
static void U_CALLCONV _deleteEngine(void *obj) {
delete (const U_NAMESPACE_QUALIFIER LanguageBreakEngine *) obj;
delete (const icu::LanguageBreakEngine *) obj;
}
U_CDECL_END
U_NAMESPACE_BEGIN

2
icu4c/source/common/brkiter.cpp
View File

@ -262,7 +262,7 @@ U_NAMESPACE_END
// defined in ucln_cmn.h
static U_NAMESPACE_QUALIFIER ICULocaleService* gService = NULL;
static icu::ICULocaleService* gService = NULL;
/**
* Release all static memory held by breakiterator.

10
icu4c/source/common/cpputils.h
View File

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1997-2010, International Business Machines
* Copyright (C) 1997-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -69,7 +69,7 @@ uprv_arrayCopy(const UChar *src, int32_t srcStart,
* @internal
*/
static inline void
uprv_arrayCopy(const U_NAMESPACE_QUALIFIER UnicodeString *src, U_NAMESPACE_QUALIFIER UnicodeString *dst, int32_t count)
uprv_arrayCopy(const icu::UnicodeString *src, icu::UnicodeString *dst, int32_t count)
{ while(count-- > 0) *dst++ = *src++; }
/**
@ -77,8 +77,8 @@ uprv_arrayCopy(const U_NAMESPACE_QUALIFIER UnicodeString *src, U_NAMESPACE_QUALI
* @internal
*/
static inline void
uprv_arrayCopy(const U_NAMESPACE_QUALIFIER UnicodeString *src, int32_t srcStart,
U_NAMESPACE_QUALIFIER UnicodeString *dst, int32_t dstStart, int32_t count)
uprv_arrayCopy(const icu::UnicodeString *src, int32_t srcStart,
icu::UnicodeString *dst, int32_t dstStart, int32_t count)
{ uprv_arrayCopy(src+srcStart, dst+dstStart, count); }
/**
@ -86,7 +86,7 @@ uprv_arrayCopy(const U_NAMESPACE_QUALIFIER UnicodeString *src, int32_t srcStart,
* Sets U_ILLEGAL_ARGUMENT_ERROR if the string isBogus() or has an open getBuffer().
*/
inline void
uprv_checkCanGetBuffer(const U_NAMESPACE_QUALIFIER UnicodeString &s, UErrorCode &errorCode) {
uprv_checkCanGetBuffer(const icu::UnicodeString &s, UErrorCode &errorCode) {
if(U_SUCCESS(errorCode) && s.isBogus()) {
errorCode=U_ILLEGAL_ARGUMENT_ERROR;
}

4
icu4c/source/common/locavailable.cpp
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 1997-2010, International Business Machines
* Copyright (C) 1997-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -28,7 +28,7 @@
// C++ API ----------------------------------------------------------------- ***
static U_NAMESPACE_QUALIFIER Locale* availableLocaleList = NULL;
static icu::Locale* availableLocaleList = NULL;
static int32_t availableLocaleListCount;
U_CDECL_BEGIN

8
icu4c/source/common/locid.cpp
View File

@ -76,9 +76,9 @@ U_CFUNC int32_t locale_getKeywords(const char *localeID,
UBool valuesToo,
UErrorCode *status);
static U_NAMESPACE_QUALIFIER Locale *gLocaleCache = NULL;
static U_NAMESPACE_QUALIFIER Locale *gDefaultLocale = NULL;
static UHashtable *gDefaultLocalesHashT = NULL;
static icu::Locale *gLocaleCache = NULL;
static icu::Locale *gDefaultLocale = NULL;
static UHashtable *gDefaultLocalesHashT = NULL;
U_CDECL_BEGIN
//
@ -86,7 +86,7 @@ U_CDECL_BEGIN
//
static void U_CALLCONV
deleteLocale(void *obj) {
delete (U_NAMESPACE_QUALIFIER Locale *) obj;
delete (icu::Locale *) obj;
}
static UBool U_CALLCONV locale_cleanup(void)

6
icu4c/source/common/locutil.cpp
View File

@ -1,6 +1,6 @@
/**
/*
*******************************************************************************
* Copyright (C) 2002-2010, International Business Machines Corporation and
* Copyright (C) 2002-2011, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@ -18,7 +18,7 @@
#include "umutex.h"
// see LocaleUtility::getAvailableLocaleNames
static U_NAMESPACE_QUALIFIER Hashtable * LocaleUtility_cache = NULL;
static icu::Hashtable * LocaleUtility_cache = NULL;
#define UNDERSCORE_CHAR ((UChar)0x005f)
#define AT_SIGN_CHAR ((UChar)64)

4
icu4c/source/common/rbbi.cpp
View File

@ -1780,7 +1780,7 @@ U_NAMESPACE_END
// defined in ucln_cmn.h
static U_NAMESPACE_QUALIFIER UStack *gLanguageBreakFactories = NULL;
static icu::UStack *gLanguageBreakFactories = NULL;
/**
* Release all static memory held by breakiterator.
@ -1797,7 +1797,7 @@ U_CDECL_END
U_CDECL_BEGIN
static void U_CALLCONV _deleteFactory(void *obj) {
delete (U_NAMESPACE_QUALIFIER LanguageBreakFactory *) obj;
delete (icu::LanguageBreakFactory *) obj;
}
U_CDECL_END
U_NAMESPACE_BEGIN

2
icu4c/source/common/rbbiscan.cpp
View File

@ -71,7 +71,7 @@ static const UChar kAny[] = {0x61, 0x6e, 0x79, 0x00}; // "any"
U_CDECL_BEGIN
static void U_CALLCONV RBBISetTable_deleter(void *p) {
U_NAMESPACE_QUALIFIER RBBISetTableEl *px = (U_NAMESPACE_QUALIFIER RBBISetTableEl *)p;
icu::RBBISetTableEl *px = (icu::RBBISetTableEl *)p;
delete px->key;
// Note: px->val is owned by the linked list "fSetsListHead" in scanner.
// Don't delete the value nodes here.

6
icu4c/source/common/rbbistbl.cpp
View File

@ -3,8 +3,8 @@
//
/*
***************************************************************************
* Copyright (C) 2002-2006 International Business Machines Corporation *
* and others. All rights reserved. *
* Copyright (C) 2002-2011 International Business Machines Corporation
* and others. All rights reserved.
***************************************************************************
*/
@ -29,7 +29,7 @@
//
U_CDECL_BEGIN
static void U_CALLCONV RBBISymbolTableEntry_deleter(void *p) {
U_NAMESPACE_QUALIFIER RBBISymbolTableEntry *px = (U_NAMESPACE_QUALIFIER RBBISymbolTableEntry *)p;
icu::RBBISymbolTableEntry *px = (icu::RBBISymbolTableEntry *)p;
delete px;
}
U_CDECL_END

4
icu4c/source/common/stringtriebuilder.cpp
View File

@ -22,12 +22,12 @@ U_CDECL_BEGIN
static int32_t U_CALLCONV
hashStringTrieNode(const UHashTok key) {
return U_NAMESPACE_QUALIFIER StringTrieBuilder::hashNode(key.pointer);
return icu::StringTrieBuilder::hashNode(key.pointer);
}
static UBool U_CALLCONV
equalStringTrieNodes(const UHashTok key1, const UHashTok key2) {
return U_NAMESPACE_QUALIFIER StringTrieBuilder::equalNodes(key1.pointer, key2.pointer);
return icu::StringTrieBuilder::equalNodes(key1.pointer, key2.pointer);
}
U_CDECL_END

5
icu4c/source/common/unicode/platform.h.in
View File

@ -140,11 +140,6 @@
/** @{ Compiler and environment features */
/*===========================================================================*/
/* Define whether namespace is supported */
#ifndef U_HAVE_NAMESPACE
#define U_HAVE_NAMESPACE @U_HAVE_NAMESPACE@
#endif
/* Determines the endianness of the platform
It's done this way in case multiple architectures are being built at once.
For example, Darwin supports fat binaries, which can be both PPC and x86 based. */

5
icu4c/source/common/unicode/ppalmos.h
View File

@ -145,11 +145,6 @@ typedef unsigned int uint32_t;
/* Compiler and environment features */
/*===========================================================================*/
/* Define whether namespace is supported */
#ifndef U_HAVE_NAMESPACE
#define U_HAVE_NAMESPACE 1
#endif
/* Determines the endianness of the platform */
#define U_IS_BIG_ENDIAN 0

5
icu4c/source/common/unicode/pwin32.h
View File

@ -172,11 +172,6 @@ typedef unsigned int uint32_t;
/** Compiler and environment features */
/*===========================================================================*/
/** Define whether namespace is supported */
#ifndef U_HAVE_NAMESPACE
#define U_HAVE_NAMESPACE 1
#endif
/** Determines the endianness of the platform */
#define U_IS_BIG_ENDIAN 0

37
icu4c/source/common/unicode/std_string.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2009-2010, International Business Machines
* Copyright (C) 2009-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -38,41 +38,6 @@
#include <string>
/**
* \def U_STD_NS
* Define the namespace to use for standard C++ (STL) classes.
* Either std or empty.
* @draft ICU 4.2
*/
/**
* \def U_STD_NSQ
* Define the namespace qualifier to use for standard C++ (STL) classes.
* Either std:: or empty.
* For example,
* U_STD_NSQ string StringFromUnicodeString(const UnicodeString &unistr);
* @draft ICU 4.2
*/
/**
* \def U_STD_NS_USE
* This is used to specify that the rest of the code uses the
* standard (STL) namespace.
* Either "using namespace std;" or empty.
* @draft ICU 4.2
*/
#ifndef U_STD_NSQ
# if U_HAVE_NAMESPACE
# define U_STD_NS std
# define U_STD_NSQ U_STD_NS::
# define U_STD_NS_USE using namespace U_STD_NS;
# else
# define U_STD_NS
# define U_STD_NSQ
# define U_STD_NS_USE
# endif
#endif
#endif // U_HAVE_STD_STRING
#endif // __STD_STRING_H__

4
icu4c/source/common/unicode/stringpiece.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2011, International Business Machines
// Copyright (C) 2009-2011, International Business Machines
// Corporation and others. All Rights Reserved.
//
// Copyright 2001 and onwards Google Inc.
@ -71,7 +71,7 @@ class U_COMMON_API StringPiece : public UMemory {
* Constructs from a std::string.
* @stable ICU 4.2
*/
StringPiece(const U_STD_NSQ string& str)
StringPiece(const std::string& str)
: ptr_(str.data()), length_(static_cast<int32_t>(str.size())) { }
#endif
/**

4
icu4c/source/common/unicode/uenum.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2002-2010, International Business Machines
* Copyright (C) 2002-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -167,7 +167,7 @@ uenum_reset(UEnumeration* en, UErrorCode* status);
* @draft ICU 4.2
*/
U_CAPI UEnumeration* U_EXPORT2
uenum_openFromStringEnumeration(U_NAMESPACE_QUALIFIER StringEnumeration* adopted, UErrorCode* ec);
uenum_openFromStringEnumeration(icu::StringEnumeration* adopted, UErrorCode* ec);
#endif

6
icu4c/source/common/unicode/uiter.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2002-2006,2009 International Business Machines
* Copyright (C) 2002-2011 International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -673,7 +673,7 @@ uiter_setUTF8(UCharIterator *iter, const char *s, int32_t length);
* @stable ICU 2.1
*/
U_STABLE void U_EXPORT2
uiter_setCharacterIterator(UCharIterator *iter, U_NAMESPACE_QUALIFIER CharacterIterator *charIter);
uiter_setCharacterIterator(UCharIterator *iter, icu::CharacterIterator *charIter);
/**
* Set up a UCharIterator to iterate over a C++ Replaceable.
@ -698,7 +698,7 @@ uiter_setCharacterIterator(UCharIterator *iter, U_NAMESPACE_QUALIFIER CharacterI
* @stable ICU 2.1
*/
U_STABLE void U_EXPORT2
uiter_setReplaceable(UCharIterator *iter, const U_NAMESPACE_QUALIFIER Replaceable *rep);
uiter_setReplaceable(UCharIterator *iter, const icu::Replaceable *rep);
#endif

10
icu4c/source/common/unicode/unistr.h
View File

@ -88,7 +88,7 @@ class UnicodeStringAppendable; // unicode/appendable.h
*
* @stable ICU 3.2
*/
#define US_INV U_NAMESPACE_QUALIFIER UnicodeString::kInvariant
#define US_INV icu::UnicodeString::kInvariant
/**
* Unicode String literals in C++.
@ -108,13 +108,13 @@ class UnicodeStringAppendable; // unicode/appendable.h
* @stable ICU 2.0
*/
#if defined(U_DECLARE_UTF16)
# define UNICODE_STRING(cs, _length) U_NAMESPACE_QUALIFIER UnicodeString(TRUE, (const UChar *)U_DECLARE_UTF16(cs), _length)
# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const UChar *)U_DECLARE_UTF16(cs), _length)
#elif U_SIZEOF_WCHAR_T==U_SIZEOF_UCHAR && (U_CHARSET_FAMILY==U_ASCII_FAMILY || (U_SIZEOF_UCHAR == 2 && defined(U_WCHAR_IS_UTF16)))
# define UNICODE_STRING(cs, _length) U_NAMESPACE_QUALIFIER UnicodeString(TRUE, (const UChar *)L ## cs, _length)
# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const UChar *)L ## cs, _length)
#elif U_SIZEOF_UCHAR==1 && U_CHARSET_FAMILY==U_ASCII_FAMILY
# define UNICODE_STRING(cs, _length) U_NAMESPACE_QUALIFIER UnicodeString(TRUE, (const UChar *)cs, _length)
# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const UChar *)cs, _length)
#else
# define UNICODE_STRING(cs, _length) U_NAMESPACE_QUALIFIER UnicodeString(cs, _length, US_INV)
# define UNICODE_STRING(cs, _length) icu::UnicodeString(cs, _length, US_INV)
#endif
/**

515
icu4c/source/common/unicode/urename.h
View File

@ -1757,521 +1757,6 @@
#define ztrans_setTime U_ICU_ENTRY_POINT_RENAME(ztrans_setTime)
#define ztrans_setTo U_ICU_ENTRY_POINT_RENAME(ztrans_setTo)
/* C++ class names renaming defines */
#ifdef XP_CPLUSPLUS
#if !U_HAVE_NAMESPACE
#define AbsoluteValueSubstitution U_ICU_ENTRY_POINT_RENAME(AbsoluteValueSubstitution)
#define AlphabeticIndex U_ICU_ENTRY_POINT_RENAME(AlphabeticIndex)
#define AlternateSubstitutionSubtable U_ICU_ENTRY_POINT_RENAME(AlternateSubstitutionSubtable)
#define AnchorTable U_ICU_ENTRY_POINT_RENAME(AnchorTable)
#define AndConstraint U_ICU_ENTRY_POINT_RENAME(AndConstraint)
#define AnnualTimeZoneRule U_ICU_ENTRY_POINT_RENAME(AnnualTimeZoneRule)
#define AnyTransliterator U_ICU_ENTRY_POINT_RENAME(AnyTransliterator)
#define Appendable U_ICU_ENTRY_POINT_RENAME(Appendable)
#define ArabicOpenTypeLayoutEngine U_ICU_ENTRY_POINT_RENAME(ArabicOpenTypeLayoutEngine)
#define ArabicShaping U_ICU_ENTRY_POINT_RENAME(ArabicShaping)
#define ArgExtractor U_ICU_ENTRY_POINT_RENAME(ArgExtractor)
#define BMPSet U_ICU_ENTRY_POINT_RENAME(BMPSet)
#define BackwardUTrie2StringIterator U_ICU_ENTRY_POINT_RENAME(BackwardUTrie2StringIterator)
#define BadCharacterTable U_ICU_ENTRY_POINT_RENAME(BadCharacterTable)
#define BasicCalendarFactory U_ICU_ENTRY_POINT_RENAME(BasicCalendarFactory)
#define BasicTimeZone U_ICU_ENTRY_POINT_RENAME(BasicTimeZone)
#define BinarySearchLookupTable U_ICU_ENTRY_POINT_RENAME(BinarySearchLookupTable)
#define BoyerMooreSearch U_ICU_ENTRY_POINT_RENAME(BoyerMooreSearch)
#define BreakIterator U_ICU_ENTRY_POINT_RENAME(BreakIterator)
#define BreakTransliterator U_ICU_ENTRY_POINT_RENAME(BreakTransliterator)
#define BuddhistCalendar U_ICU_ENTRY_POINT_RENAME(BuddhistCalendar)
#define BuildCompactTrieHorizontalNode U_ICU_ENTRY_POINT_RENAME(BuildCompactTrieHorizontalNode)
#define BuildCompactTrieNode U_ICU_ENTRY_POINT_RENAME(BuildCompactTrieNode)
#define BuildCompactTrieVerticalNode U_ICU_ENTRY_POINT_RENAME(BuildCompactTrieVerticalNode)
#define BuilderScriptSet U_ICU_ENTRY_POINT_RENAME(BuilderScriptSet)
#define ByteSink U_ICU_ENTRY_POINT_RENAME(ByteSink)
#define BytesTrie U_ICU_ENTRY_POINT_RENAME(BytesTrie)
#define BytesTrieBuilder U_ICU_ENTRY_POINT_RENAME(BytesTrieBuilder)
#define BytesTrieElement U_ICU_ENTRY_POINT_RENAME(BytesTrieElement)
#define CEBuffer U_ICU_ENTRY_POINT_RENAME(CEBuffer)
#define CECalendar U_ICU_ENTRY_POINT_RENAME(CECalendar)
#define CEList U_ICU_ENTRY_POINT_RENAME(CEList)
#define CEToStringsMap U_ICU_ENTRY_POINT_RENAME(CEToStringsMap)
#define CFactory U_ICU_ENTRY_POINT_RENAME(CFactory)
#define Calendar U_ICU_ENTRY_POINT_RENAME(Calendar)
#define CalendarAstronomer U_ICU_ENTRY_POINT_RENAME(CalendarAstronomer)
#define CalendarCache U_ICU_ENTRY_POINT_RENAME(CalendarCache)
#define CalendarData U_ICU_ENTRY_POINT_RENAME(CalendarData)
#define CalendarService U_ICU_ENTRY_POINT_RENAME(CalendarService)
#define CanonIterData U_ICU_ENTRY_POINT_RENAME(CanonIterData)
#define CanonIterDataSingleton U_ICU_ENTRY_POINT_RENAME(CanonIterDataSingleton)
#define CanonMarkFilter U_ICU_ENTRY_POINT_RENAME(CanonMarkFilter)
#define CanonShaping U_ICU_ENTRY_POINT_RENAME(CanonShaping)
#define CanonicalIterator U_ICU_ENTRY_POINT_RENAME(CanonicalIterator)
#define CaseMapTransliterator U_ICU_ENTRY_POINT_RENAME(CaseMapTransliterator)
#define ChainingContextualSubstitutionFormat1Subtable U_ICU_ENTRY_POINT_RENAME(ChainingContextualSubstitutionFormat1Subtable)
#define ChainingContextualSubstitutionFormat2Subtable U_ICU_ENTRY_POINT_RENAME(ChainingContextualSubstitutionFormat2Subtable)
#define ChainingContextualSubstitutionFormat3Subtable U_ICU_ENTRY_POINT_RENAME(ChainingContextualSubstitutionFormat3Subtable)
#define ChainingContextualSubstitutionSubtable U_ICU_ENTRY_POINT_RENAME(ChainingContextualSubstitutionSubtable)
#define CharString U_ICU_ENTRY_POINT_RENAME(CharString)
#define CharSubstitutionFilter U_ICU_ENTRY_POINT_RENAME(CharSubstitutionFilter)
#define CharacterIterator U_ICU_ENTRY_POINT_RENAME(CharacterIterator)
#define CharacterNode U_ICU_ENTRY_POINT_RENAME(CharacterNode)
#define CharsetDetector U_ICU_ENTRY_POINT_RENAME(CharsetDetector)
#define CharsetMatch U_ICU_ENTRY_POINT_RENAME(CharsetMatch)
#define CharsetRecog_2022 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_2022)
#define CharsetRecog_2022CN U_ICU_ENTRY_POINT_RENAME(CharsetRecog_2022CN)
#define CharsetRecog_2022JP U_ICU_ENTRY_POINT_RENAME(CharsetRecog_2022JP)
#define CharsetRecog_2022KR U_ICU_ENTRY_POINT_RENAME(CharsetRecog_2022KR)
#define CharsetRecog_8859_1 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_1)
#define CharsetRecog_8859_1_da U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_1_da)
#define CharsetRecog_8859_1_de U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_1_de)
#define CharsetRecog_8859_1_en U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_1_en)
#define CharsetRecog_8859_1_es U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_1_es)
#define CharsetRecog_8859_1_fr U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_1_fr)
#define CharsetRecog_8859_1_it U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_1_it)
#define CharsetRecog_8859_1_nl U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_1_nl)
#define CharsetRecog_8859_1_no U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_1_no)
#define CharsetRecog_8859_1_pt U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_1_pt)
#define CharsetRecog_8859_1_sv U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_1_sv)
#define CharsetRecog_8859_2 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_2)
#define CharsetRecog_8859_2_cs U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_2_cs)
#define CharsetRecog_8859_2_hu U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_2_hu)
#define CharsetRecog_8859_2_pl U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_2_pl)
#define CharsetRecog_8859_2_ro U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_2_ro)
#define CharsetRecog_8859_5 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_5)
#define CharsetRecog_8859_5_ru U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_5_ru)
#define CharsetRecog_8859_6 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_6)
#define CharsetRecog_8859_6_ar U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_6_ar)
#define CharsetRecog_8859_7 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_7)
#define CharsetRecog_8859_7_el U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_7_el)
#define CharsetRecog_8859_8 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_8)
#define CharsetRecog_8859_8_I_he U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_8_I_he)
#define CharsetRecog_8859_8_he U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_8_he)
#define CharsetRecog_8859_9 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_9)
#define CharsetRecog_8859_9_tr U_ICU_ENTRY_POINT_RENAME(CharsetRecog_8859_9_tr)
#define CharsetRecog_IBM420_ar U_ICU_ENTRY_POINT_RENAME(CharsetRecog_IBM420_ar)
#define CharsetRecog_IBM420_ar_ltr U_ICU_ENTRY_POINT_RENAME(CharsetRecog_IBM420_ar_ltr)
#define CharsetRecog_IBM420_ar_rtl U_ICU_ENTRY_POINT_RENAME(CharsetRecog_IBM420_ar_rtl)
#define CharsetRecog_IBM424_he U_ICU_ENTRY_POINT_RENAME(CharsetRecog_IBM424_he)
#define CharsetRecog_IBM424_he_ltr U_ICU_ENTRY_POINT_RENAME(CharsetRecog_IBM424_he_ltr)
#define CharsetRecog_IBM424_he_rtl U_ICU_ENTRY_POINT_RENAME(CharsetRecog_IBM424_he_rtl)
#define CharsetRecog_KOI8_R U_ICU_ENTRY_POINT_RENAME(CharsetRecog_KOI8_R)
#define CharsetRecog_UTF8 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_UTF8)
#define CharsetRecog_UTF_16_BE U_ICU_ENTRY_POINT_RENAME(CharsetRecog_UTF_16_BE)
#define CharsetRecog_UTF_16_LE U_ICU_ENTRY_POINT_RENAME(CharsetRecog_UTF_16_LE)
#define CharsetRecog_UTF_32 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_UTF_32)
#define CharsetRecog_UTF_32_BE U_ICU_ENTRY_POINT_RENAME(CharsetRecog_UTF_32_BE)
#define CharsetRecog_UTF_32_LE U_ICU_ENTRY_POINT_RENAME(CharsetRecog_UTF_32_LE)
#define CharsetRecog_Unicode U_ICU_ENTRY_POINT_RENAME(CharsetRecog_Unicode)
#define CharsetRecog_big5 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_big5)
#define CharsetRecog_euc U_ICU_ENTRY_POINT_RENAME(CharsetRecog_euc)
#define CharsetRecog_euc_jp U_ICU_ENTRY_POINT_RENAME(CharsetRecog_euc_jp)
#define CharsetRecog_euc_kr U_ICU_ENTRY_POINT_RENAME(CharsetRecog_euc_kr)
#define CharsetRecog_gb_18030 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_gb_18030)
#define CharsetRecog_mbcs U_ICU_ENTRY_POINT_RENAME(CharsetRecog_mbcs)
#define CharsetRecog_sbcs U_ICU_ENTRY_POINT_RENAME(CharsetRecog_sbcs)
#define CharsetRecog_sjis U_ICU_ENTRY_POINT_RENAME(CharsetRecog_sjis)
#define CharsetRecog_windows_1251 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_windows_1251)
#define CharsetRecog_windows_1256 U_ICU_ENTRY_POINT_RENAME(CharsetRecog_windows_1256)
#define CharsetRecognizer U_ICU_ENTRY_POINT_RENAME(CharsetRecognizer)
#define CheckedArrayByteSink U_ICU_ENTRY_POINT_RENAME(CheckedArrayByteSink)
#define ChineseCalendar U_ICU_ENTRY_POINT_RENAME(ChineseCalendar)
#define ChoiceFormat U_ICU_ENTRY_POINT_RENAME(ChoiceFormat)
#define ClassDefFormat1Table U_ICU_ENTRY_POINT_RENAME(ClassDefFormat1Table)
#define ClassDefFormat2Table U_ICU_ENTRY_POINT_RENAME(ClassDefFormat2Table)
#define ClassDefinitionTable U_ICU_ENTRY_POINT_RENAME(ClassDefinitionTable)
#define ClockMath U_ICU_ENTRY_POINT_RENAME(ClockMath)
#define CollData U_ICU_ENTRY_POINT_RENAME(CollData)
#define CollDataCache U_ICU_ENTRY_POINT_RENAME(CollDataCache)
#define CollDataCacheEntry U_ICU_ENTRY_POINT_RENAME(CollDataCacheEntry)
#define CollationElementIterator U_ICU_ENTRY_POINT_RENAME(CollationElementIterator)
#define CollationKey U_ICU_ENTRY_POINT_RENAME(CollationKey)
#define CollationLocaleListEnumeration U_ICU_ENTRY_POINT_RENAME(CollationLocaleListEnumeration)
#define Collator U_ICU_ENTRY_POINT_RENAME(Collator)
#define CollatorFactory U_ICU_ENTRY_POINT_RENAME(CollatorFactory)
#define CompactTrieDictionary U_ICU_ENTRY_POINT_RENAME(CompactTrieDictionary)
#define CompactTrieEnumeration U_ICU_ENTRY_POINT_RENAME(CompactTrieEnumeration)
#define ComposeNormalizer2 U_ICU_ENTRY_POINT_RENAME(ComposeNormalizer2)
#define CompoundTransliterator U_ICU_ENTRY_POINT_RENAME(CompoundTransliterator)
#define ConfusabledataBuilder U_ICU_ENTRY_POINT_RENAME(ConfusabledataBuilder)
#define ContextualGlyphSubstitutionProcessor U_ICU_ENTRY_POINT_RENAME(ContextualGlyphSubstitutionProcessor)
#define ContextualSubstitutionBase U_ICU_ENTRY_POINT_RENAME(ContextualSubstitutionBase)
#define ContextualSubstitutionFormat1Subtable U_ICU_ENTRY_POINT_RENAME(ContextualSubstitutionFormat1Subtable)
#define ContextualSubstitutionFormat2Subtable U_ICU_ENTRY_POINT_RENAME(ContextualSubstitutionFormat2Subtable)
#define ContextualSubstitutionFormat3Subtable U_ICU_ENTRY_POINT_RENAME(ContextualSubstitutionFormat3Subtable)
#define ContextualSubstitutionSubtable U_ICU_ENTRY_POINT_RENAME(ContextualSubstitutionSubtable)
#define CopticCalendar U_ICU_ENTRY_POINT_RENAME(CopticCalendar)
#define CoverageFormat1Table U_ICU_ENTRY_POINT_RENAME(CoverageFormat1Table)
#define CoverageFormat2Table U_ICU_ENTRY_POINT_RENAME(CoverageFormat2Table)
#define CoverageTable U_ICU_ENTRY_POINT_RENAME(CoverageTable)
#define CurrencyAmount U_ICU_ENTRY_POINT_RENAME(CurrencyAmount)
#define CurrencyFormat U_ICU_ENTRY_POINT_RENAME(CurrencyFormat)
#define CurrencyPluralInfo U_ICU_ENTRY_POINT_RENAME(CurrencyPluralInfo)
#define CurrencyUnit U_ICU_ENTRY_POINT_RENAME(CurrencyUnit)
#define CursiveAttachmentSubtable U_ICU_ENTRY_POINT_RENAME(CursiveAttachmentSubtable)
#define DTRedundantEnumeration U_ICU_ENTRY_POINT_RENAME(DTRedundantEnumeration)
#define DTSkeletonEnumeration U_ICU_ENTRY_POINT_RENAME(DTSkeletonEnumeration)
#define DateFormat U_ICU_ENTRY_POINT_RENAME(DateFormat)
#define DateFormatSymbols U_ICU_ENTRY_POINT_RENAME(DateFormatSymbols)
#define DateInterval U_ICU_ENTRY_POINT_RENAME(DateInterval)
#define DateIntervalFormat U_ICU_ENTRY_POINT_RENAME(DateIntervalFormat)
#define DateIntervalInfo U_ICU_ENTRY_POINT_RENAME(DateIntervalInfo)
#define DateTimeMatcher U_ICU_ENTRY_POINT_RENAME(DateTimeMatcher)
#define DateTimePatternGenerator U_ICU_ENTRY_POINT_RENAME(DateTimePatternGenerator)
#define DateTimeRule U_ICU_ENTRY_POINT_RENAME(DateTimeRule)
#define DecimalFormat U_ICU_ENTRY_POINT_RENAME(DecimalFormat)
#define DecimalFormatStaticSets U_ICU_ENTRY_POINT_RENAME(DecimalFormatStaticSets)
#define DecimalFormatSymbols U_ICU_ENTRY_POINT_RENAME(DecimalFormatSymbols)
#define DecomposeNormalizer2 U_ICU_ENTRY_POINT_RENAME(DecomposeNormalizer2)
#define DefaultCalendarFactory U_ICU_ENTRY_POINT_RENAME(DefaultCalendarFactory)
#define DefaultCharMapper U_ICU_ENTRY_POINT_RENAME(DefaultCharMapper)
#define DeviceTable U_ICU_ENTRY_POINT_RENAME(DeviceTable)
#define DictionaryBreakEngine U_ICU_ENTRY_POINT_RENAME(DictionaryBreakEngine)
#define DigitList U_ICU_ENTRY_POINT_RENAME(DigitList)
#define DistanceInfo U_ICU_ENTRY_POINT_RENAME(DistanceInfo)
#define ErrorCode U_ICU_ENTRY_POINT_RENAME(ErrorCode)
#define EscapeTransliterator U_ICU_ENTRY_POINT_RENAME(EscapeTransliterator)
#define EthiopicCalendar U_ICU_ENTRY_POINT_RENAME(EthiopicCalendar)
#define EventListener U_ICU_ENTRY_POINT_RENAME(EventListener)
#define ExtensionSubtable U_ICU_ENTRY_POINT_RENAME(ExtensionSubtable)
#define FCDNormalizer2 U_ICU_ENTRY_POINT_RENAME(FCDNormalizer2)
#define FCDTrieSingleton U_ICU_ENTRY_POINT_RENAME(FCDTrieSingleton)
#define FeatureListTable U_ICU_ENTRY_POINT_RENAME(FeatureListTable)
#define FieldPosition U_ICU_ENTRY_POINT_RENAME(FieldPosition)
#define FieldPositionHandler U_ICU_ENTRY_POINT_RENAME(FieldPositionHandler)
#define FieldPositionIterator U_ICU_ENTRY_POINT_RENAME(FieldPositionIterator)
#define FieldPositionIteratorHandler U_ICU_ENTRY_POINT_RENAME(FieldPositionIteratorHandler)
#define FieldPositionOnlyHandler U_ICU_ENTRY_POINT_RENAME(FieldPositionOnlyHandler)
#define FilteredNormalizer2 U_ICU_ENTRY_POINT_RENAME(FilteredNormalizer2)
#define FontRuns U_ICU_ENTRY_POINT_RENAME(FontRuns)
#define Format U_ICU_ENTRY_POINT_RENAME(Format)
#define Format1AnchorTable U_ICU_ENTRY_POINT_RENAME(Format1AnchorTable)
#define Format2AnchorTable U_ICU_ENTRY_POINT_RENAME(Format2AnchorTable)
#define Format3AnchorTable U_ICU_ENTRY_POINT_RENAME(Format3AnchorTable)
#define FormatNameEnumeration U_ICU_ENTRY_POINT_RENAME(FormatNameEnumeration)
#define FormatParser U_ICU_ENTRY_POINT_RENAME(FormatParser)
#define Formattable U_ICU_ENTRY_POINT_RENAME(Formattable)
#define ForwardCharacterIterator U_ICU_ENTRY_POINT_RENAME(ForwardCharacterIterator)
#define ForwardUTrie2StringIterator U_ICU_ENTRY_POINT_RENAME(ForwardUTrie2StringIterator)
#define FractionalPartSubstitution U_ICU_ENTRY_POINT_RENAME(FractionalPartSubstitution)
#define FunctionReplacer U_ICU_ENTRY_POINT_RENAME(FunctionReplacer)
#define GDEFMarkFilter U_ICU_ENTRY_POINT_RENAME(GDEFMarkFilter)
#define GNameSearchHandler U_ICU_ENTRY_POINT_RENAME(GNameSearchHandler)
#define GXLayoutEngine U_ICU_ENTRY_POINT_RENAME(GXLayoutEngine)
#define GlyphDefinitionTableHeader U_ICU_ENTRY_POINT_RENAME(GlyphDefinitionTableHeader)
#define GlyphIterator U_ICU_ENTRY_POINT_RENAME(GlyphIterator)
#define GlyphLookupTableHeader U_ICU_ENTRY_POINT_RENAME(GlyphLookupTableHeader)
#define GlyphPositionAdjustments U_ICU_ENTRY_POINT_RENAME(GlyphPositionAdjustments)
#define GlyphPositioningLookupProcessor U_ICU_ENTRY_POINT_RENAME(GlyphPositioningLookupProcessor)
#define GlyphPositioningTableHeader U_ICU_ENTRY_POINT_RENAME(GlyphPositioningTableHeader)
#define GlyphSubstitutionLookupProcessor U_ICU_ENTRY_POINT_RENAME(GlyphSubstitutionLookupProcessor)
#define GlyphSubstitutionTableHeader U_ICU_ENTRY_POINT_RENAME(GlyphSubstitutionTableHeader)
#define GoodSuffixTable U_ICU_ENTRY_POINT_RENAME(GoodSuffixTable)
#define Grego U_ICU_ENTRY_POINT_RENAME(Grego)
#define GregorianCalendar U_ICU_ENTRY_POINT_RENAME(GregorianCalendar)
#define HanOpenTypeLayoutEngine U_ICU_ENTRY_POINT_RENAME(HanOpenTypeLayoutEngine)
#define HangulOpenTypeLayoutEngine U_ICU_ENTRY_POINT_RENAME(HangulOpenTypeLayoutEngine)
#define HebrewCalendar U_ICU_ENTRY_POINT_RENAME(HebrewCalendar)
#define ICUBreakIteratorFactory U_ICU_ENTRY_POINT_RENAME(ICUBreakIteratorFactory)
#define ICUBreakIteratorService U_ICU_ENTRY_POINT_RENAME(ICUBreakIteratorService)
#define ICUCollatorFactory U_ICU_ENTRY_POINT_RENAME(ICUCollatorFactory)
#define ICUCollatorService U_ICU_ENTRY_POINT_RENAME(ICUCollatorService)
#define ICUDataTable U_ICU_ENTRY_POINT_RENAME(ICUDataTable)
#define ICULanguageBreakFactory U_ICU_ENTRY_POINT_RENAME(ICULanguageBreakFactory)
#define ICULocaleService U_ICU_ENTRY_POINT_RENAME(ICULocaleService)
#define ICUNotifier U_ICU_ENTRY_POINT_RENAME(ICUNotifier)
#define ICUNumberFormatFactory U_ICU_ENTRY_POINT_RENAME(ICUNumberFormatFactory)
#define ICUNumberFormatService U_ICU_ENTRY_POINT_RENAME(ICUNumberFormatService)
#define ICUResourceBundleFactory U_ICU_ENTRY_POINT_RENAME(ICUResourceBundleFactory)
#define ICUService U_ICU_ENTRY_POINT_RENAME(ICUService)
#define ICUServiceFactory U_ICU_ENTRY_POINT_RENAME(ICUServiceFactory)
#define ICUServiceKey U_ICU_ENTRY_POINT_RENAME(ICUServiceKey)
#define ICU_Utility U_ICU_ENTRY_POINT_RENAME(ICU_Utility)
#define IDNA U_ICU_ENTRY_POINT_RENAME(IDNA)
#define IndianCalendar U_ICU_ENTRY_POINT_RENAME(IndianCalendar)
#define IndicClassTable U_ICU_ENTRY_POINT_RENAME(IndicClassTable)
#define IndicOpenTypeLayoutEngine U_ICU_ENTRY_POINT_RENAME(IndicOpenTypeLayoutEngine)
#define IndicRearrangementProcessor U_ICU_ENTRY_POINT_RENAME(IndicRearrangementProcessor)
#define IndicReordering U_ICU_ENTRY_POINT_RENAME(IndicReordering)
#define InitialTimeZoneRule U_ICU_ENTRY_POINT_RENAME(InitialTimeZoneRule)
#define InputText U_ICU_ENTRY_POINT_RENAME(InputText)
#define IntegralPartSubstitution U_ICU_ENTRY_POINT_RENAME(IntegralPartSubstitution)
#define IslamicCalendar U_ICU_ENTRY_POINT_RENAME(IslamicCalendar)
#define IteratedChar U_ICU_ENTRY_POINT_RENAME(IteratedChar)
#define JapaneseCalendar U_ICU_ENTRY_POINT_RENAME(JapaneseCalendar)
#define KernTable U_ICU_ENTRY_POINT_RENAME(KernTable)
#define KeywordEnumeration U_ICU_ENTRY_POINT_RENAME(KeywordEnumeration)
#define KhmerBreakEngine U_ICU_ENTRY_POINT_RENAME(KhmerBreakEngine)
#define KhmerClassTable U_ICU_ENTRY_POINT_RENAME(KhmerClassTable)
#define KhmerOpenTypeLayoutEngine U_ICU_ENTRY_POINT_RENAME(KhmerOpenTypeLayoutEngine)
#define KhmerReordering U_ICU_ENTRY_POINT_RENAME(KhmerReordering)
#define LECharMapper U_ICU_ENTRY_POINT_RENAME(LECharMapper)
#define LEFontInstance U_ICU_ENTRY_POINT_RENAME(LEFontInstance)
#define LEGlyphFilter U_ICU_ENTRY_POINT_RENAME(LEGlyphFilter)
#define LEGlyphStorage U_ICU_ENTRY_POINT_RENAME(LEGlyphStorage)
#define LEInsertionCallback U_ICU_ENTRY_POINT_RENAME(LEInsertionCallback)
#define LEInsertionList U_ICU_ENTRY_POINT_RENAME(LEInsertionList)
#define LXUtilities U_ICU_ENTRY_POINT_RENAME(LXUtilities)
#define LanguageBreakEngine U_ICU_ENTRY_POINT_RENAME(LanguageBreakEngine)
#define LanguageBreakFactory U_ICU_ENTRY_POINT_RENAME(LanguageBreakFactory)
#define LayoutEngine U_ICU_ENTRY_POINT_RENAME(LayoutEngine)
#define LigatureSubstitutionProcessor U_ICU_ENTRY_POINT_RENAME(LigatureSubstitutionProcessor)
#define LigatureSubstitutionSubtable U_ICU_ENTRY_POINT_RENAME(LigatureSubstitutionSubtable)
#define LocDataParser U_ICU_ENTRY_POINT_RENAME(LocDataParser)
#define Locale U_ICU_ENTRY_POINT_RENAME(Locale)
#define LocaleBased U_ICU_ENTRY_POINT_RENAME(LocaleBased)
#define LocaleDisplayNames U_ICU_ENTRY_POINT_RENAME(LocaleDisplayNames)
#define LocaleDisplayNamesImpl U_ICU_ENTRY_POINT_RENAME(LocaleDisplayNamesImpl)
#define LocaleKey U_ICU_ENTRY_POINT_RENAME(LocaleKey)
#define LocaleKeyFactory U_ICU_ENTRY_POINT_RENAME(LocaleKeyFactory)
#define LocaleRuns U_ICU_ENTRY_POINT_RENAME(LocaleRuns)
#define LocaleUtility U_ICU_ENTRY_POINT_RENAME(LocaleUtility)
#define LocalizationInfo U_ICU_ENTRY_POINT_RENAME(LocalizationInfo)
#define LookupListTable U_ICU_ENTRY_POINT_RENAME(LookupListTable)
#define LookupProcessor U_ICU_ENTRY_POINT_RENAME(LookupProcessor)
#define LookupSubtable U_ICU_ENTRY_POINT_RENAME(LookupSubtable)
#define LookupTable U_ICU_ENTRY_POINT_RENAME(LookupTable)
#define LowercaseTransliterator U_ICU_ENTRY_POINT_RENAME(LowercaseTransliterator)
#define MPreFixups U_ICU_ENTRY_POINT_RENAME(MPreFixups)
#define MarkArray U_ICU_ENTRY_POINT_RENAME(MarkArray)
#define MarkToBasePositioningSubtable U_ICU_ENTRY_POINT_RENAME(MarkToBasePositioningSubtable)
#define MarkToLigaturePositioningSubtable U_ICU_ENTRY_POINT_RENAME(MarkToLigaturePositioningSubtable)
#define MarkToMarkPositioningSubtable U_ICU_ENTRY_POINT_RENAME(MarkToMarkPositioningSubtable)
#define Measure U_ICU_ENTRY_POINT_RENAME(Measure)
#define MeasureFormat U_ICU_ENTRY_POINT_RENAME(MeasureFormat)
#define MeasureUnit U_ICU_ENTRY_POINT_RENAME(MeasureUnit)
#define MessageFormat U_ICU_ENTRY_POINT_RENAME(MessageFormat)
#define MessageFormatAdapter U_ICU_ENTRY_POINT_RENAME(MessageFormatAdapter)
#define MessageImpl U_ICU_ENTRY_POINT_RENAME(MessageImpl)
#define MessagePattern U_ICU_ENTRY_POINT_RENAME(MessagePattern)
#define MetaZoneIDsEnumeration U_ICU_ENTRY_POINT_RENAME(MetaZoneIDsEnumeration)
#define ModulusSubstitution U_ICU_ENTRY_POINT_RENAME(ModulusSubstitution)
#define MoonRiseSetCoordFunc U_ICU_ENTRY_POINT_RENAME(MoonRiseSetCoordFunc)
#define MoonTimeAngleFunc U_ICU_ENTRY_POINT_RENAME(MoonTimeAngleFunc)
#define MorphSubtableHeader U_ICU_ENTRY_POINT_RENAME(MorphSubtableHeader)
#define MorphTableHeader U_ICU_ENTRY_POINT_RENAME(MorphTableHeader)
#define MultipleSubstitutionSubtable U_ICU_ENTRY_POINT_RENAME(MultipleSubstitutionSubtable)
#define MultiplierSubstitution U_ICU_ENTRY_POINT_RENAME(MultiplierSubstitution)
#define MutableTrieDictionary U_ICU_ENTRY_POINT_RENAME(MutableTrieDictionary)
#define MutableTrieEnumeration U_ICU_ENTRY_POINT_RENAME(MutableTrieEnumeration)
#define NFDBuffer U_ICU_ENTRY_POINT_RENAME(NFDBuffer)
#define NFFactory U_ICU_ENTRY_POINT_RENAME(NFFactory)
#define NFRule U_ICU_ENTRY_POINT_RENAME(NFRule)
#define NFRuleSet U_ICU_ENTRY_POINT_RENAME(NFRuleSet)
#define NFSubstitution U_ICU_ENTRY_POINT_RENAME(NFSubstitution)
#define NGramParser U_ICU_ENTRY_POINT_RENAME(NGramParser)
#define NameUnicodeTransliterator U_ICU_ENTRY_POINT_RENAME(NameUnicodeTransliterator)
#define NonContextualGlyphSubstitutionProcessor U_ICU_ENTRY_POINT_RENAME(NonContextualGlyphSubstitutionProcessor)
#define NoopNormalizer2 U_ICU_ENTRY_POINT_RENAME(NoopNormalizer2)
#define Norm2AllModes U_ICU_ENTRY_POINT_RENAME(Norm2AllModes)
#define NormalizationTransliterator U_ICU_ENTRY_POINT_RENAME(NormalizationTransliterator)
#define Normalizer U_ICU_ENTRY_POINT_RENAME(Normalizer)
#define Normalizer2 U_ICU_ENTRY_POINT_RENAME(Normalizer2)
#define Normalizer2Factory U_ICU_ENTRY_POINT_RENAME(Normalizer2Factory)
#define Normalizer2Impl U_ICU_ENTRY_POINT_RENAME(Normalizer2Impl)
#define Normalizer2WithImpl U_ICU_ENTRY_POINT_RENAME(Normalizer2WithImpl)
#define NullSubstitution U_ICU_ENTRY_POINT_RENAME(NullSubstitution)
#define NullTransliterator U_ICU_ENTRY_POINT_RENAME(NullTransliterator)
#define NumberFormat U_ICU_ENTRY_POINT_RENAME(NumberFormat)
#define NumberFormatFactory U_ICU_ENTRY_POINT_RENAME(NumberFormatFactory)
#define NumberingSystem U_ICU_ENTRY_POINT_RENAME(NumberingSystem)
#define NumeratorSubstitution U_ICU_ENTRY_POINT_RENAME(NumeratorSubstitution)
#define OlsonTimeZone U_ICU_ENTRY_POINT_RENAME(OlsonTimeZone)
#define OpenTypeLayoutEngine U_ICU_ENTRY_POINT_RENAME(OpenTypeLayoutEngine)
#define OpenTypeUtilities U_ICU_ENTRY_POINT_RENAME(OpenTypeUtilities)
#define OrConstraint U_ICU_ENTRY_POINT_RENAME(OrConstraint)
#define PCEBuffer U_ICU_ENTRY_POINT_RENAME(PCEBuffer)
#define PairPositioningFormat1Subtable U_ICU_ENTRY_POINT_RENAME(PairPositioningFormat1Subtable)
#define PairPositioningFormat2Subtable U_ICU_ENTRY_POINT_RENAME(PairPositioningFormat2Subtable)
#define PairPositioningSubtable U_ICU_ENTRY_POINT_RENAME(PairPositioningSubtable)
#define ParagraphLayout U_ICU_ENTRY_POINT_RENAME(ParagraphLayout)
#define ParseData U_ICU_ENTRY_POINT_RENAME(ParseData)
#define ParsePosition U_ICU_ENTRY_POINT_RENAME(ParsePosition)
#define PatternMap U_ICU_ENTRY_POINT_RENAME(PatternMap)
#define PatternMapIterator U_ICU_ENTRY_POINT_RENAME(PatternMapIterator)
#define PatternProps U_ICU_ENTRY_POINT_RENAME(PatternProps)
#define PersianCalendar U_ICU_ENTRY_POINT_RENAME(PersianCalendar)
#define PluralFormat U_ICU_ENTRY_POINT_RENAME(PluralFormat)
#define PluralKeywordEnumeration U_ICU_ENTRY_POINT_RENAME(PluralKeywordEnumeration)
#define PluralRules U_ICU_ENTRY_POINT_RENAME(PluralRules)
#define PropNameData U_ICU_ENTRY_POINT_RENAME(PropNameData)
#define PtnElem U_ICU_ENTRY_POINT_RENAME(PtnElem)
#define PtnSkeleton U_ICU_ENTRY_POINT_RENAME(PtnSkeleton)
#define Quantifier U_ICU_ENTRY_POINT_RENAME(Quantifier)
#define RBBIDataWrapper U_ICU_ENTRY_POINT_RENAME(RBBIDataWrapper)
#define RBBINode U_ICU_ENTRY_POINT_RENAME(RBBINode)
#define RBBIRuleBuilder U_ICU_ENTRY_POINT_RENAME(RBBIRuleBuilder)
#define RBBIRuleScanner U_ICU_ENTRY_POINT_RENAME(RBBIRuleScanner)
#define RBBISetBuilder U_ICU_ENTRY_POINT_RENAME(RBBISetBuilder)
#define RBBIStateDescriptor U_ICU_ENTRY_POINT_RENAME(RBBIStateDescriptor)
#define RBBISymbolTable U_ICU_ENTRY_POINT_RENAME(RBBISymbolTable)
#define RBBISymbolTableEntry U_ICU_ENTRY_POINT_RENAME(RBBISymbolTableEntry)
#define RBBITableBuilder U_ICU_ENTRY_POINT_RENAME(RBBITableBuilder)
#define RCEBuffer U_ICU_ENTRY_POINT_RENAME(RCEBuffer)
#define RangeDescriptor U_ICU_ENTRY_POINT_RENAME(RangeDescriptor)
#define RegexCompile U_ICU_ENTRY_POINT_RENAME(RegexCompile)
#define RegexMatcher U_ICU_ENTRY_POINT_RENAME(RegexMatcher)
#define RegexPattern U_ICU_ENTRY_POINT_RENAME(RegexPattern)
#define RegexStaticSets U_ICU_ENTRY_POINT_RENAME(RegexStaticSets)
#define RegularExpression U_ICU_ENTRY_POINT_RENAME(RegularExpression)
#define RelativeDateFormat U_ICU_ENTRY_POINT_RENAME(RelativeDateFormat)
#define RemoveTransliterator U_ICU_ENTRY_POINT_RENAME(RemoveTransliterator)
#define ReorderingBuffer U_ICU_ENTRY_POINT_RENAME(ReorderingBuffer)
#define Replaceable U_ICU_ENTRY_POINT_RENAME(Replaceable)
#define ReplaceableGlue U_ICU_ENTRY_POINT_RENAME(ReplaceableGlue)
#define ResourceBundle U_ICU_ENTRY_POINT_RENAME(ResourceBundle)
#define RiseSetCoordFunc U_ICU_ENTRY_POINT_RENAME(RiseSetCoordFunc)
#define RuleBasedBreakIterator U_ICU_ENTRY_POINT_RENAME(RuleBasedBreakIterator)
#define RuleBasedCollator U_ICU_ENTRY_POINT_RENAME(RuleBasedCollator)
#define RuleBasedNumberFormat U_ICU_ENTRY_POINT_RENAME(RuleBasedNumberFormat)
#define RuleBasedTimeZone U_ICU_ENTRY_POINT_RENAME(RuleBasedTimeZone)
#define RuleBasedTransliterator U_ICU_ENTRY_POINT_RENAME(RuleBasedTransliterator)
#define RuleChain U_ICU_ENTRY_POINT_RENAME(RuleChain)
#define RuleCharacterIterator U_ICU_ENTRY_POINT_RENAME(RuleCharacterIterator)
#define RuleHalf U_ICU_ENTRY_POINT_RENAME(RuleHalf)
#define RuleParser U_ICU_ENTRY_POINT_RENAME(RuleParser)
#define RunArray U_ICU_ENTRY_POINT_RENAME(RunArray)
#define SPUString U_ICU_ENTRY_POINT_RENAME(SPUString)
#define SPUStringPool U_ICU_ENTRY_POINT_RENAME(SPUStringPool)
#define SameValueSubstitution U_ICU_ENTRY_POINT_RENAME(SameValueSubstitution)
#define ScriptListTable U_ICU_ENTRY_POINT_RENAME(ScriptListTable)
#define ScriptRunIterator U_ICU_ENTRY_POINT_RENAME(ScriptRunIterator)
#define ScriptSet U_ICU_ENTRY_POINT_RENAME(ScriptSet)
#define ScriptTable U_ICU_ENTRY_POINT_RENAME(ScriptTable)
#define SearchIterator U_ICU_ENTRY_POINT_RENAME(SearchIterator)
#define SegmentArrayProcessor U_ICU_ENTRY_POINT_RENAME(SegmentArrayProcessor)
#define SegmentSingleProcessor U_ICU_ENTRY_POINT_RENAME(SegmentSingleProcessor)
#define SelectFormat U_ICU_ENTRY_POINT_RENAME(SelectFormat)
#define ServiceEnumeration U_ICU_ENTRY_POINT_RENAME(ServiceEnumeration)
#define ServiceListener U_ICU_ENTRY_POINT_RENAME(ServiceListener)
#define SimpleArrayProcessor U_ICU_ENTRY_POINT_RENAME(SimpleArrayProcessor)
#define SimpleDateFormat U_ICU_ENTRY_POINT_RENAME(SimpleDateFormat)
#define SimpleDateFormatStaticSets U_ICU_ENTRY_POINT_RENAME(SimpleDateFormatStaticSets)
#define SimpleFactory U_ICU_ENTRY_POINT_RENAME(SimpleFactory)
#define SimpleLocaleKeyFactory U_ICU_ENTRY_POINT_RENAME(SimpleLocaleKeyFactory)
#define SimpleNumberFormatFactory U_ICU_ENTRY_POINT_RENAME(SimpleNumberFormatFactory)
#define SimpleSingleton U_ICU_ENTRY_POINT_RENAME(SimpleSingleton)
#define SimpleTimeZone U_ICU_ENTRY_POINT_RENAME(SimpleTimeZone)
#define SinglePositioningFormat1Subtable U_ICU_ENTRY_POINT_RENAME(SinglePositioningFormat1Subtable)
#define SinglePositioningFormat2Subtable U_ICU_ENTRY_POINT_RENAME(SinglePositioningFormat2Subtable)
#define SinglePositioningSubtable U_ICU_ENTRY_POINT_RENAME(SinglePositioningSubtable)
#define SingleSubstitutionFormat1Subtable U_ICU_ENTRY_POINT_RENAME(SingleSubstitutionFormat1Subtable)
#define SingleSubstitutionFormat2Subtable U_ICU_ENTRY_POINT_RENAME(SingleSubstitutionFormat2Subtable)
#define SingleSubstitutionSubtable U_ICU_ENTRY_POINT_RENAME(SingleSubstitutionSubtable)
#define SingleTableProcessor U_ICU_ENTRY_POINT_RENAME(SingleTableProcessor)
#define SortKeyByteSink U_ICU_ENTRY_POINT_RENAME(SortKeyByteSink)
#define SpoofData U_ICU_ENTRY_POINT_RENAME(SpoofData)
#define SpoofImpl U_ICU_ENTRY_POINT_RENAME(SpoofImpl)
#define StateTableProcessor U_ICU_ENTRY_POINT_RENAME(StateTableProcessor)
#define StringCharacterIterator U_ICU_ENTRY_POINT_RENAME(StringCharacterIterator)
#define StringEnumeration U_ICU_ENTRY_POINT_RENAME(StringEnumeration)
#define StringList U_ICU_ENTRY_POINT_RENAME(StringList)
#define StringLocalizationInfo U_ICU_ENTRY_POINT_RENAME(StringLocalizationInfo)
#define StringMatcher U_ICU_ENTRY_POINT_RENAME(StringMatcher)
#define StringPair U_ICU_ENTRY_POINT_RENAME(StringPair)
#define StringPiece U_ICU_ENTRY_POINT_RENAME(StringPiece)
#define StringReplacer U_ICU_ENTRY_POINT_RENAME(StringReplacer)
#define StringSearch U_ICU_ENTRY_POINT_RENAME(StringSearch)
#define StringToCEsMap U_ICU_ENTRY_POINT_RENAME(StringToCEsMap)
#define StringTrieBuilder U_ICU_ENTRY_POINT_RENAME(StringTrieBuilder)
#define StyleRuns U_ICU_ENTRY_POINT_RENAME(StyleRuns)
#define SubstitutionLookup U_ICU_ENTRY_POINT_RENAME(SubstitutionLookup)
#define SubtableProcessor U_ICU_ENTRY_POINT_RENAME(SubtableProcessor)
#define SunTimeAngleFunc U_ICU_ENTRY_POINT_RENAME(SunTimeAngleFunc)
#define SymbolTable U_ICU_ENTRY_POINT_RENAME(SymbolTable)
#define TZEnumeration U_ICU_ENTRY_POINT_RENAME(TZEnumeration)
#define TZNames U_ICU_ENTRY_POINT_RENAME(TZNames)
#define TaiwanCalendar U_ICU_ENTRY_POINT_RENAME(TaiwanCalendar)
#define Target U_ICU_ENTRY_POINT_RENAME(Target)
#define TernaryNode U_ICU_ENTRY_POINT_RENAME(TernaryNode)
#define TextTrieMap U_ICU_ENTRY_POINT_RENAME(TextTrieMap)
#define TextTrieMapSearchResultHandler U_ICU_ENTRY_POINT_RENAME(TextTrieMapSearchResultHandler)
#define ThaiBreakEngine U_ICU_ENTRY_POINT_RENAME(ThaiBreakEngine)
#define ThaiLayoutEngine U_ICU_ENTRY_POINT_RENAME(ThaiLayoutEngine)
#define ThaiShaping U_ICU_ENTRY_POINT_RENAME(ThaiShaping)
#define TibetanClassTable U_ICU_ENTRY_POINT_RENAME(TibetanClassTable)
#define TibetanOpenTypeLayoutEngine U_ICU_ENTRY_POINT_RENAME(TibetanOpenTypeLayoutEngine)
#define TibetanReordering U_ICU_ENTRY_POINT_RENAME(TibetanReordering)
#define TimeArrayTimeZoneRule U_ICU_ENTRY_POINT_RENAME(TimeArrayTimeZoneRule)
#define TimeUnit U_ICU_ENTRY_POINT_RENAME(TimeUnit)
#define TimeUnitAmount U_ICU_ENTRY_POINT_RENAME(TimeUnitAmount)
#define TimeUnitFormat U_ICU_ENTRY_POINT_RENAME(TimeUnitFormat)
#define TimeZone U_ICU_ENTRY_POINT_RENAME(TimeZone)
#define TimeZoneFormat U_ICU_ENTRY_POINT_RENAME(TimeZoneFormat)
#define TimeZoneFormatDelegate U_ICU_ENTRY_POINT_RENAME(TimeZoneFormatDelegate)
#define TimeZoneFormatImpl U_ICU_ENTRY_POINT_RENAME(TimeZoneFormatImpl)
#define TimeZoneGenericNameMatchInfo U_ICU_ENTRY_POINT_RENAME(TimeZoneGenericNameMatchInfo)
#define TimeZoneGenericNames U_ICU_ENTRY_POINT_RENAME(TimeZoneGenericNames)
#define TimeZoneNameMatchInfo U_ICU_ENTRY_POINT_RENAME(TimeZoneNameMatchInfo)
#define TimeZoneNameMatchInfoImpl U_ICU_ENTRY_POINT_RENAME(TimeZoneNameMatchInfoImpl)
#define TimeZoneNames U_ICU_ENTRY_POINT_RENAME(TimeZoneNames)
#define TimeZoneNamesDelegate U_ICU_ENTRY_POINT_RENAME(TimeZoneNamesDelegate)
#define TimeZoneNamesImpl U_ICU_ENTRY_POINT_RENAME(TimeZoneNamesImpl)
#define TimeZoneRule U_ICU_ENTRY_POINT_RENAME(TimeZoneRule)
#define TimeZoneTransition U_ICU_ENTRY_POINT_RENAME(TimeZoneTransition)
#define TitlecaseTransliterator U_ICU_ENTRY_POINT_RENAME(TitlecaseTransliterator)
#define TransliterationRule U_ICU_ENTRY_POINT_RENAME(TransliterationRule)
#define TransliterationRuleData U_ICU_ENTRY_POINT_RENAME(TransliterationRuleData)
#define TransliterationRuleSet U_ICU_ENTRY_POINT_RENAME(TransliterationRuleSet)
#define Transliterator U_ICU_ENTRY_POINT_RENAME(Transliterator)
#define TransliteratorAlias U_ICU_ENTRY_POINT_RENAME(TransliteratorAlias)
#define TransliteratorEntry U_ICU_ENTRY_POINT_RENAME(TransliteratorEntry)
#define TransliteratorIDParser U_ICU_ENTRY_POINT_RENAME(TransliteratorIDParser)
#define TransliteratorParser U_ICU_ENTRY_POINT_RENAME(TransliteratorParser)
#define TransliteratorRegistry U_ICU_ENTRY_POINT_RENAME(TransliteratorRegistry)
#define TransliteratorSpec U_ICU_ENTRY_POINT_RENAME(TransliteratorSpec)
#define TriStateSingleton U_ICU_ENTRY_POINT_RENAME(TriStateSingleton)
#define TrieWordDictionary U_ICU_ENTRY_POINT_RENAME(TrieWordDictionary)
#define TrimmedArrayProcessor U_ICU_ENTRY_POINT_RENAME(TrimmedArrayProcessor)
#define UCharCharacterIterator U_ICU_ENTRY_POINT_RENAME(UCharCharacterIterator)
#define UCharsTrie U_ICU_ENTRY_POINT_RENAME(UCharsTrie)
#define UCharsTrieBuilder U_ICU_ENTRY_POINT_RENAME(UCharsTrieBuilder)
#define UCharsTrieElement U_ICU_ENTRY_POINT_RENAME(UCharsTrieElement)
#define UCollationPCE U_ICU_ENTRY_POINT_RENAME(UCollationPCE)
#define UDataPathIterator U_ICU_ENTRY_POINT_RENAME(UDataPathIterator)
#define ULocRuns U_ICU_ENTRY_POINT_RENAME(ULocRuns)
#define UMemory U_ICU_ENTRY_POINT_RENAME(UMemory)
#define UObject U_ICU_ENTRY_POINT_RENAME(UObject)
#define UStack U_ICU_ENTRY_POINT_RENAME(UStack)
#define UStringEnumeration U_ICU_ENTRY_POINT_RENAME(UStringEnumeration)
#define UTS46 U_ICU_ENTRY_POINT_RENAME(UTS46)
#define UTrie2Singleton U_ICU_ENTRY_POINT_RENAME(UTrie2Singleton)
#define UVector U_ICU_ENTRY_POINT_RENAME(UVector)
#define UVector32 U_ICU_ENTRY_POINT_RENAME(UVector32)
#define UVector64 U_ICU_ENTRY_POINT_RENAME(UVector64)
#define UnescapeTransliterator U_ICU_ENTRY_POINT_RENAME(UnescapeTransliterator)
#define UnhandledEngine U_ICU_ENTRY_POINT_RENAME(UnhandledEngine)
#define UnicodeArabicOpenTypeLayoutEngine U_ICU_ENTRY_POINT_RENAME(UnicodeArabicOpenTypeLayoutEngine)
#define UnicodeFilter U_ICU_ENTRY_POINT_RENAME(UnicodeFilter)
#define UnicodeFunctor U_ICU_ENTRY_POINT_RENAME(UnicodeFunctor)
#define UnicodeMatcher U_ICU_ENTRY_POINT_RENAME(UnicodeMatcher)
#define UnicodeNameTransliterator U_ICU_ENTRY_POINT_RENAME(UnicodeNameTransliterator)
#define UnicodeReplacer U_ICU_ENTRY_POINT_RENAME(UnicodeReplacer)
#define UnicodeSet U_ICU_ENTRY_POINT_RENAME(UnicodeSet)
#define UnicodeSetIterator U_ICU_ENTRY_POINT_RENAME(UnicodeSetIterator)
#define UnicodeSetStringSpan U_ICU_ENTRY_POINT_RENAME(UnicodeSetStringSpan)
#define UnicodeString U_ICU_ENTRY_POINT_RENAME(UnicodeString)
#define UnicodeStringAppendable U_ICU_ENTRY_POINT_RENAME(UnicodeStringAppendable)
#define UppercaseTransliterator U_ICU_ENTRY_POINT_RENAME(UppercaseTransliterator)
#define VTZReader U_ICU_ENTRY_POINT_RENAME(VTZReader)
#define VTZWriter U_ICU_ENTRY_POINT_RENAME(VTZWriter)
#define VTimeZone U_ICU_ENTRY_POINT_RENAME(VTimeZone)
#define ValueRecord U_ICU_ENTRY_POINT_RENAME(ValueRecord)
#define ValueRuns U_ICU_ENTRY_POINT_RENAME(ValueRuns)
#define ZNStringPool U_ICU_ENTRY_POINT_RENAME(ZNStringPool)
#define ZNStringPoolChunk U_ICU_ENTRY_POINT_RENAME(ZNStringPoolChunk)
#define ZNameSearchHandler U_ICU_ENTRY_POINT_RENAME(ZNameSearchHandler)
#define ZNames U_ICU_ENTRY_POINT_RENAME(ZNames)
#define ZoneMeta U_ICU_ENTRY_POINT_RENAME(ZoneMeta)
#define collIterate U_ICU_ENTRY_POINT_RENAME(collIterate)
#define locale_set_default_internal U_ICU_ENTRY_POINT_RENAME(locale_set_default_internal)
#define util64_fromDouble U_ICU_ENTRY_POINT_RENAME(util64_fromDouble)
#define util64_pow U_ICU_ENTRY_POINT_RENAME(util64_pow)
#define util64_tou U_ICU_ENTRY_POINT_RENAME(util64_tou)
#endif
#endif
#endif
#endif

10
icu4c/source/common/unicode/utext.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2004-2010, International Business Machines
* Copyright (C) 2004-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -257,7 +257,7 @@ utext_openUChars(UText *ut, const UChar *s, int64_t length, UErrorCode *status);
* @stable ICU 3.4
*/
U_STABLE UText * U_EXPORT2
utext_openUnicodeString(UText *ut, U_NAMESPACE_QUALIFIER UnicodeString *s, UErrorCode *status);
utext_openUnicodeString(UText *ut, icu::UnicodeString *s, UErrorCode *status);
/**
@ -273,7 +273,7 @@ utext_openUnicodeString(UText *ut, U_NAMESPACE_QUALIFIER UnicodeString *s, UErro
* @stable ICU 3.4
*/
U_STABLE UText * U_EXPORT2
utext_openConstUnicodeString(UText *ut, const U_NAMESPACE_QUALIFIER UnicodeString *s, UErrorCode *status);
utext_openConstUnicodeString(UText *ut, const icu::UnicodeString *s, UErrorCode *status);
/**
@ -289,7 +289,7 @@ utext_openConstUnicodeString(UText *ut, const U_NAMESPACE_QUALIFIER UnicodeStrin
* @stable ICU 3.4
*/
U_STABLE UText * U_EXPORT2
utext_openReplaceable(UText *ut, U_NAMESPACE_QUALIFIER Replaceable *rep, UErrorCode *status);
utext_openReplaceable(UText *ut, icu::Replaceable *rep, UErrorCode *status);
/**
* Open a UText implementation over an ICU CharacterIterator.
@ -304,7 +304,7 @@ utext_openReplaceable(UText *ut, U_NAMESPACE_QUALIFIER Replaceable *rep, UErrorC
* @stable ICU 3.4
*/
U_STABLE UText * U_EXPORT2
utext_openCharacterIterator(UText *ut, U_NAMESPACE_QUALIFIER CharacterIterator *ic, UErrorCode *status);
utext_openCharacterIterator(UText *ut, icu::CharacterIterator *ic, UErrorCode *status);
#endif

24
icu4c/source/common/unicode/uversion.h
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2000-2010, International Business Machines
* Copyright (C) 2000-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*
@ -67,7 +67,8 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
* When compiling for C++, it begins an extern "C++" linkage block (to protect
* against cases in which an external client includes ICU header files inside
* an extern "C" linkage block).
* If the C++ compiler supports namespaces, it also begins a namespace block.
*
* It also begins a versioned-ICU-namespace block.
* @stable ICU 2.4
*/
@ -77,8 +78,8 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
* When not compiling for C++, it does nothing.
* When compiling for C++, it ends the extern "C++" block begun by
* U_NAMESPACE_BEGIN.
* If the C++ compiler supports namespaces, it also ends the namespace block
* begun by U_NAMESPACE_BEGIN.
*
* It also ends the versioned-ICU-namespace block begun by U_NAMESPACE_BEGIN.
* @stable ICU 2.4
*/
@ -86,7 +87,9 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
* \def U_NAMESPACE_USE
* This is used to specify that the rest of the code uses the
* public ICU C++ API namespace.
* If the compiler doesn't support namespaces, this does nothing.
* This is invoked by default; we recommend that you turn it off:
* See the "Recommended Build Options" section of the ICU4C readme
* (http://source.icu-project.org/repos/icu/icu/trunk/readme.html#RecBuild)
* @stable ICU 2.4
*/
@ -94,13 +97,14 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
* \def U_NAMESPACE_QUALIFIER
* This is used to qualify that a function or class is part of
* the public ICU C++ API namespace.
* If the compiler doesn't support namespaces, this does nothing.
*
* This macro is unnecessary since ICU 49 requires namespace support.
* You can just use "icu::" instead.
* @stable ICU 2.4
*/
/* Define namespace symbols if the compiler supports it. */
#ifdef XP_CPLUSPLUS
#if U_HAVE_NAMESPACE
# if U_DISABLE_RENAMING
# define U_ICU_NAMESPACE icu
namespace U_ICU_NAMESPACE { }
@ -122,12 +126,6 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
U_NAMESPACE_USE
# endif
#else
# define U_NAMESPACE_BEGIN extern "C++" {
# define U_NAMESPACE_END }
# define U_NAMESPACE_USE
# define U_NAMESPACE_QUALIFIER
#endif
#else
# define U_NAMESPACE_BEGIN
# define U_NAMESPACE_END
# define U_NAMESPACE_USE

2
icu4c/source/common/unistr.cpp
View File

@ -87,7 +87,7 @@ us_arrayCopy(const UChar *src, int32_t srcStart,
U_CDECL_BEGIN
static UChar U_CALLCONV
UnicodeString_charAt(int32_t offset, void *context) {
return ((U_NAMESPACE_QUALIFIER UnicodeString*) context)->charAt(offset);
return ((icu::UnicodeString*) context)->charAt(offset);
}
U_CDECL_END

6
icu4c/source/common/ustrenum.cpp
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2002-2010, International Business Machines
* Copyright (c) 2002-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Alan Liu
@ -156,7 +156,7 @@ U_NAMESPACE_END
// C wrapper --------------------------------------------------------------- ***
#define THIS(en) ((U_NAMESPACE_QUALIFIER StringEnumeration*)(en->context))
#define THIS(en) ((icu::StringEnumeration*)(en->context))
U_CDECL_BEGIN
@ -233,7 +233,7 @@ U_CDECL_END
* delete it (regardless of error status).
*/
U_CAPI UEnumeration* U_EXPORT2
uenum_openFromStringEnumeration(U_NAMESPACE_QUALIFIER StringEnumeration* adopted, UErrorCode* ec) {
uenum_openFromStringEnumeration(icu::StringEnumeration* adopted, UErrorCode* ec) {
UEnumeration* result = NULL;
if (U_SUCCESS(*ec) && adopted != NULL) {
result = (UEnumeration*) uprv_malloc(sizeof(UEnumeration));

4
icu4c/source/i18n/anytrans.cpp
View File

@ -1,6 +1,6 @@
/*
*****************************************************************
* Copyright (c) 2002-2008, International Business Machines Corporation
* Copyright (c) 2002-2011, International Business Machines Corporation
* and others. All Rights Reserved.
*****************************************************************
* Date Name Description
@ -39,7 +39,7 @@ U_CDECL_BEGIN
*/
static void U_CALLCONV
_deleteTransliterator(void *obj) {
delete (U_NAMESPACE_QUALIFIER Transliterator*) obj;
delete (icu::Transliterator*) obj;
}
U_CDECL_END

2
icu4c/source/i18n/bocsu.cpp
View File

@ -95,7 +95,7 @@ u_writeDiff(int32_t diff, uint8_t *p) {
* NFD text - there are never Hangul characters included.
*/
U_CFUNC void
u_writeIdenticalLevelRun(const UChar *s, int32_t length, U_NAMESPACE_QUALIFIER ByteSink &sink) {
u_writeIdenticalLevelRun(const UChar *s, int32_t length, icu::ByteSink &sink) {
char scratch[64];
int32_t capacity;

2
icu4c/source/i18n/bocsu.h
View File

@ -152,7 +152,7 @@ U_NAMESPACE_END
}
U_CFUNC void
u_writeIdenticalLevelRun(const UChar *s, int32_t length, U_NAMESPACE_QUALIFIER ByteSink &sink);
u_writeIdenticalLevelRun(const UChar *s, int32_t length, icu::ByteSink &sink);
U_CFUNC int32_t
u_writeIdenticalLevelRunTwoChars(UChar32 first, UChar32 second, uint8_t *p);

2
icu4c/source/i18n/calendar.cpp
View File

@ -52,7 +52,7 @@
#include "ustrenum.h"
#if !UCONFIG_NO_SERVICE
static U_NAMESPACE_QUALIFIER ICULocaleService* gService = NULL;
static icu::ICULocaleService* gService = NULL;
#endif
// INTERNAL - for cleanup

8
icu4c/source/i18n/chnsecal.cpp
View File

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 2007-2008, International Business Machines Corporation
* Copyright (C) 2007-2011, International Business Machines Corporation
* and others. All Rights Reserved.
******************************************************************************
*
@ -49,9 +49,9 @@ static void debug_chnsecal_msg(const char *pat, ...)
// --- The cache --
static UMTX astroLock = 0; // pod bay door lock
static U_NAMESPACE_QUALIFIER CalendarAstronomer *gChineseCalendarAstro = NULL;
static U_NAMESPACE_QUALIFIER CalendarCache *gChineseCalendarWinterSolsticeCache = NULL;
static U_NAMESPACE_QUALIFIER CalendarCache *gChineseCalendarNewYearCache = NULL;
static icu::CalendarAstronomer *gChineseCalendarAstro = NULL;
static icu::CalendarCache *gChineseCalendarWinterSolsticeCache = NULL;
static icu::CalendarCache *gChineseCalendarNewYearCache = NULL;
/**
* The start year of the Chinese calendar, the 61st year of the reign

4
icu4c/source/i18n/coll.cpp
View File

@ -52,9 +52,9 @@
#include "uresimp.h"
#include "ucln_in.h"
static U_NAMESPACE_QUALIFIER Locale* availableLocaleList = NULL;
static icu::Locale* availableLocaleList = NULL;
static int32_t availableLocaleListCount;
static U_NAMESPACE_QUALIFIER ICULocaleService* gService = NULL;
static icu::ICULocaleService* gService = NULL;
/**
* Release all static memory held by collator.

4
icu4c/source/i18n/csdetect.cpp
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2005-2009, International Business Machines
* Copyright (C) 2005-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -33,7 +33,7 @@
#define DELETE_ARRAY(array) uprv_free((void *) (array))
U_CDECL_BEGIN
static U_NAMESPACE_QUALIFIER CharsetRecognizer **fCSRecognizers = NULL;
static icu::CharsetRecognizer **fCSRecognizers = NULL;
static int32_t fCSRecognizers_size = 0;

4
icu4c/source/i18n/hebrwcal.cpp
View File

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 2003-2008, International Business Machines Corporation
* Copyright (C) 2003-2011, International Business Machines Corporation
* and others. All Rights Reserved.
******************************************************************************
*
@ -131,7 +131,7 @@ static const int16_t LEAP_MONTH_START[][3] = {
{ 383, 384, 385 }, // Elul
};
static U_NAMESPACE_QUALIFIER CalendarCache *gCache = NULL;
static icu::CalendarCache *gCache = NULL;
U_CDECL_BEGIN
static UBool calendar_hebrew_cleanup(void) {

4
icu4c/source/i18n/islamcal.cpp
View File

@ -52,8 +52,8 @@ static void debug_islamcal_msg(const char *pat, ...)
// --- The cache --
// cache of months
static UMTX astroLock = 0; // pod bay door lock
static U_NAMESPACE_QUALIFIER CalendarCache *gMonthCache = NULL;
static U_NAMESPACE_QUALIFIER CalendarAstronomer *gIslamicCalendarAstro = NULL;
static icu::CalendarCache *gMonthCache = NULL;
static icu::CalendarAstronomer *gIslamicCalendarAstro = NULL;
U_CDECL_BEGIN
static UBool calendar_islamic_cleanup(void) {

14
icu4c/source/i18n/msgfmt.cpp
View File

@ -133,12 +133,12 @@ static const UChar * const DATE_STYLE_IDS[] = {
NULL,
};
static const U_NAMESPACE_QUALIFIER DateFormat::EStyle DATE_STYLES[] = {
U_NAMESPACE_QUALIFIER DateFormat::kDefault,
U_NAMESPACE_QUALIFIER DateFormat::kShort,
U_NAMESPACE_QUALIFIER DateFormat::kMedium,
U_NAMESPACE_QUALIFIER DateFormat::kLong,
U_NAMESPACE_QUALIFIER DateFormat::kFull,
static const icu::DateFormat::EStyle DATE_STYLES[] = {
icu::DateFormat::kDefault,
icu::DateFormat::kShort,
icu::DateFormat::kMedium,
icu::DateFormat::kLong,
icu::DateFormat::kFull,
};
static const int32_t DEFAULT_INITIAL_CAPACITY = 10;
@ -154,7 +154,7 @@ static const UChar OTHER_STRING[] = {
U_CDECL_BEGIN
static UBool U_CALLCONV equalFormatsForHash(const UHashTok key1,
const UHashTok key2) {
return U_NAMESPACE_QUALIFIER MessageFormat::equalFormats(key1.pointer, key2.pointer);
return icu::MessageFormat::equalFormats(key1.pointer, key2.pointer);
}
U_CDECL_END

4
icu4c/source/i18n/numfmt.cpp
View File

@ -141,7 +141,7 @@ static UHashtable * NumberingSystem_cache = NULL;
static UMTX nscacheMutex = NULL;
#if !UCONFIG_NO_SERVICE
static U_NAMESPACE_QUALIFIER ICULocaleService* gService = NULL;
static icu::ICULocaleService* gService = NULL;
#endif
/**
@ -150,7 +150,7 @@ static U_NAMESPACE_QUALIFIER ICULocaleService* gService = NULL;
U_CDECL_BEGIN
static void U_CALLCONV
deleteNumberingSystem(void *obj) {
delete (U_NAMESPACE_QUALIFIER NumberingSystem *)obj;
delete (icu::NumberingSystem *)obj;
}
static UBool U_CALLCONV numfmt_cleanup(void) {

10
icu4c/source/i18n/rbt_set.cpp
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1999-2008, International Business Machines
* Copyright (C) 1999-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@ -21,7 +21,7 @@
U_CDECL_BEGIN
static void U_CALLCONV _deleteRule(void *rule) {
delete (U_NAMESPACE_QUALIFIER TransliterationRule *)rule;
delete (icu::TransliterationRule *)rule;
}
U_CDECL_END
@ -133,10 +133,10 @@ inline void _debugOut(const char* msg, TransliterationRule* rule,
// Fill the precontext and postcontext with the patterns of the rules
// that are masking one another.
static void maskingError(const U_NAMESPACE_QUALIFIER TransliterationRule& rule1,
const U_NAMESPACE_QUALIFIER TransliterationRule& rule2,
static void maskingError(const icu::TransliterationRule& rule1,
const icu::TransliterationRule& rule2,
UParseError& parseError) {
U_NAMESPACE_QUALIFIER UnicodeString r;
icu::UnicodeString r;
int32_t len;
parseError.line = parseError.offset = -1;

2
icu4c/source/i18n/sortkey.cpp
View File

@ -400,7 +400,7 @@ U_CAPI int32_t U_EXPORT2
ucol_keyHashCode(const uint8_t *key,
int32_t length)
{
U_NAMESPACE_QUALIFIER CollationKey newKey(key, length);
icu::CollationKey newKey(key, length);
return newKey.hashCode();
}

8
icu4c/source/i18n/timezone.cpp
View File

@ -116,10 +116,10 @@ static const UChar VVVV_UC_STR[] = {0x56, 0x56, 0x56, 0x56, 0x00}; /* "V
static const int32_t GMT_ID_LENGTH = 3;
static const int32_t UNKNOWN_ZONE_ID_LENGTH = 11;
static UMTX LOCK;
static UMTX TZSET_LOCK;
static U_NAMESPACE_QUALIFIER TimeZone* DEFAULT_ZONE = NULL;
static U_NAMESPACE_QUALIFIER TimeZone* _GMT = NULL; // cf. TimeZone::GMT
static UMTX LOCK;
static UMTX TZSET_LOCK;
static icu::TimeZone* DEFAULT_ZONE = NULL;
static icu::TimeZone* _GMT = NULL; // cf. TimeZone::GMT
static char TZDATA_VERSION[16];
static UBool TZDataVersionInitialized = FALSE;

4
icu4c/source/i18n/translit.cpp
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1999-2010, International Business Machines
* Copyright (C) 1999-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@ -93,7 +93,7 @@ static UMTX registryMutex = 0;
/**
* System transliterator registry; non-null when initialized.
*/
static U_NAMESPACE_QUALIFIER TransliteratorRegistry* registry = 0;
static icu::TransliteratorRegistry* registry = 0;
// Macro to check/initialize the registry. ONLY USE WITHIN
// MUTEX. Avoids function call when registry is initialized.

4
icu4c/source/i18n/tznames.cpp
View File

@ -77,8 +77,8 @@ static UBool U_CALLCONV timeZoneNames_cleanup(void)
*/
static void U_CALLCONV
deleteTimeZoneNamesCacheEntry(void *obj) {
U_NAMESPACE_QUALIFIER TimeZoneNamesCacheEntry *entry = (U_NAMESPACE_QUALIFIER TimeZoneNamesCacheEntry*)obj;
delete (U_NAMESPACE_QUALIFIER TimeZoneNamesImpl*) entry->names;
icu::TimeZoneNamesCacheEntry *entry = (icu::TimeZoneNamesCacheEntry*)obj;
delete (icu::TimeZoneNamesImpl*) entry->names;
uprv_free(entry);
}
U_CDECL_END

4
icu4c/source/i18n/ucol_elm.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2000-2010, International Business Machines
* Copyright (C) 2000-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -137,7 +137,7 @@ U_CAPI UCATableHeader * U_EXPORT2 uprv_uca_assembleTable(tempUCATable *t, UError
U_CAPI int32_t U_EXPORT2
uprv_uca_canonicalClosure(tempUCATable *t, UColTokenParser *src,
U_NAMESPACE_QUALIFIER UnicodeSet *closed, UErrorCode *status);
icu::UnicodeSet *closed, UErrorCode *status);
U_CDECL_END

12
icu4c/source/i18n/ucol_imp.h
View File

@ -373,12 +373,12 @@ typedef struct UCollationPCE UCollationPCE;
U_NAMESPACE_END
struct UCollationElements : public U_NAMESPACE_QUALIFIER UMemory
struct UCollationElements : public icu::UMemory
{
/**
* Struct wrapper for source data
*/
U_NAMESPACE_QUALIFIER collIterate iteratordata_;
icu::collIterate iteratordata_;
/**
* Indicates if this data has been reset.
*/
@ -391,7 +391,7 @@ struct UCollationElements : public U_NAMESPACE_QUALIFIER UMemory
/**
* Data for getNextProcessed, getPreviousProcessed.
*/
U_NAMESPACE_QUALIFIER UCollationPCE *pce;
icu::UCollationPCE *pce;
};
#else
@ -567,7 +567,7 @@ typedef void U_CALLCONV
SortKeyGenerator(const UCollator *coll,
const UChar *source,
int32_t sourceLength,
U_NAMESPACE_QUALIFIER SortKeyByteSink &result,
icu::SortKeyByteSink &result,
UErrorCode *status);
/* worker function for generating sortkeys */
@ -576,7 +576,7 @@ void U_CALLCONV
ucol_calcSortKey(const UCollator *coll,
const UChar *source,
int32_t sourceLength,
U_NAMESPACE_QUALIFIER SortKeyByteSink &result,
icu::SortKeyByteSink &result,
UErrorCode *status);
U_CFUNC
@ -584,7 +584,7 @@ void U_CALLCONV
ucol_calcSortKeySimpleTertiary(const UCollator *coll,
const UChar *source,
int32_t sourceLength,
U_NAMESPACE_QUALIFIER SortKeyByteSink &result,
icu::SortKeyByteSink &result,
UErrorCode *status);
#else

2
icu4c/source/i18n/ucoleitr.cpp
View File

@ -41,7 +41,7 @@ U_NAMESPACE_USE
#define DELETE_ARRAY(array) uprv_free((void *) (array))
typedef struct U_NAMESPACE_QUALIFIER collIterate collIterator;
typedef struct icu::collIterate collIterator;
struct RCEI
{

8
icu4c/source/i18n/ucurr.cpp
View File

@ -252,7 +252,7 @@ struct CReg;
static UMTX gCRegLock = 0;
static CReg* gCRegHead = 0;
struct CReg : public U_NAMESPACE_QUALIFIER UMemory {
struct CReg : public icu::UMemory {
CReg *next;
UChar iso[ISO_COUNTRY_CODE_LENGTH+1];
char id[ULOC_FULLNAME_CAPACITY];
@ -1268,8 +1268,8 @@ currency_cache_cleanup(void) {
U_CFUNC void
uprv_parseCurrency(const char* locale,
const U_NAMESPACE_QUALIFIER UnicodeString& text,
U_NAMESPACE_QUALIFIER ParsePosition& pos,
const icu::UnicodeString& text,
icu::ParsePosition& pos,
int8_t type,
UChar* result,
UErrorCode& ec)
@ -1421,7 +1421,7 @@ uprv_parseCurrency(const char* locale,
*/
U_CFUNC void
uprv_getStaticCurrencyName(const UChar* iso, const char* loc,
U_NAMESPACE_QUALIFIER UnicodeString& result, UErrorCode& ec)
icu::UnicodeString& result, UErrorCode& ec)
{
U_NAMESPACE_USE

8
icu4c/source/i18n/ucurrimp.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2002-2009, International Business Machines
* Copyright (c) 2002-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -24,7 +24,7 @@
*/
U_CFUNC void
uprv_getStaticCurrencyName(const UChar* iso, const char* loc,
U_NAMESPACE_QUALIFIER UnicodeString& result, UErrorCode& ec);
icu::UnicodeString& result, UErrorCode& ec);
/**
* Attempt to parse the given string as a currency, either as a
@ -48,8 +48,8 @@ uprv_getStaticCurrencyName(const UChar* iso, const char* loc,
*/
U_CFUNC void
uprv_parseCurrency(const char* locale,
const U_NAMESPACE_QUALIFIER UnicodeString& text,
U_NAMESPACE_QUALIFIER ParsePosition& pos,
const icu::UnicodeString& text,
icu::ParsePosition& pos,
int8_t type,
UChar* result,
UErrorCode& ec);

8
icu4c/source/i18n/unicode/uspoof.h
View File

@ -1,6 +1,6 @@
/*
***************************************************************************
* Copyright (C) 2008-2010, International Business Machines Corporation
* Copyright (C) 2008-2011, International Business Machines Corporation
* and others. All Rights Reserved.
***************************************************************************
* file name: uspoof.h
@ -621,7 +621,7 @@ uspoof_checkUTF8(const USpoofChecker *sc,
*/
U_STABLE int32_t U_EXPORT2
uspoof_checkUnicodeString(const USpoofChecker *sc,
const U_NAMESPACE_QUALIFIER UnicodeString &text,
const icu::UnicodeString &text,
int32_t *position,
UErrorCode *status);
@ -733,8 +733,8 @@ uspoof_areConfusableUTF8(const USpoofChecker *sc,
*/
U_STABLE int32_t U_EXPORT2
uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
const U_NAMESPACE_QUALIFIER UnicodeString &s1,
const U_NAMESPACE_QUALIFIER UnicodeString &s2,
const icu::UnicodeString &s1,
const icu::UnicodeString &s2,
UErrorCode *status);
#endif

6
icu4c/source/i18n/uspoof.cpp
View File

@ -565,8 +565,8 @@ uspoof_areConfusableUTF8(const USpoofChecker *sc,
U_CAPI int32_t U_EXPORT2
uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
const U_NAMESPACE_QUALIFIER UnicodeString &s1,
const U_NAMESPACE_QUALIFIER UnicodeString &s2,
const icu::UnicodeString &s1,
const icu::UnicodeString &s2,
UErrorCode *status) {
const UChar *u1 = s1.getBuffer();
@ -583,7 +583,7 @@ uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
U_CAPI int32_t U_EXPORT2
uspoof_checkUnicodeString(const USpoofChecker *sc,
const U_NAMESPACE_QUALIFIER UnicodeString &text,
const icu::UnicodeString &text,
int32_t *position,
UErrorCode *status) {
int32_t result = uspoof_check(sc, text.getBuffer(), text.length(), position, status);

4
icu4c/source/i18n/usrchimp.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2001-2010 IBM and others. All rights reserved.
* Copyright (C) 2001-2011 IBM and others. All rights reserved.
**********************************************************************
* Date Name Description
* 08/13/2001 synwee Creation.
@ -61,7 +61,7 @@ struct UStringSearch {
struct USearch *search;
struct UPattern pattern;
const UCollator *collator;
const U_NAMESPACE_QUALIFIER Normalizer2 *nfd;
const icu::Normalizer2 *nfd;
// positions within the collation element iterator is used to determine
// if we are at the start of the text.
UCollationElements *textIter;

10
icu4c/source/i18n/zonemeta.cpp
View File

@ -37,13 +37,13 @@ static UHashtable *gOlsonToMeta = NULL;
static UBool gOlsonToMetaInitialized = FALSE;
// Available metazone IDs vector and table
static U_NAMESPACE_QUALIFIER UVector *gMetaZoneIDs = NULL;
static icu::UVector *gMetaZoneIDs = NULL;
static UHashtable *gMetaZoneIDTable = NULL;
static UBool gMetaZoneIDsInitialized = FALSE;
// Country info vectors
static U_NAMESPACE_QUALIFIER UVector *gSingleZoneCountries = NULL;
static U_NAMESPACE_QUALIFIER UVector *gMultiZonesCountries = NULL;
static icu::UVector *gSingleZoneCountries = NULL;
static icu::UVector *gMultiZonesCountries = NULL;
static UBool gCountryInfoVectorsInitialized = FALSE;
U_CDECL_BEGIN
@ -96,7 +96,7 @@ deleteUCharString(void *obj) {
*/
static void U_CALLCONV
deleteUVector(void *obj) {
delete (U_NAMESPACE_QUALIFIER UVector*) obj;
delete (icu::UVector*) obj;
}
/**
@ -104,7 +104,7 @@ deleteUVector(void *obj) {
*/
static void U_CALLCONV
deleteOlsonToMetaMappingEntry(void *obj) {
U_NAMESPACE_QUALIFIER OlsonToMetaMappingEntry *entry = (U_NAMESPACE_QUALIFIER OlsonToMetaMappingEntry*)obj;
icu::OlsonToMetaMappingEntry *entry = (icu::OlsonToMetaMappingEntry*)obj;
uprv_free(entry);
}

2
icu4c/source/test/intltest/callimts.cpp
View File

@ -49,7 +49,7 @@ void CalendarLimitTest::runIndexedTest( int32_t index, UBool exec, const char* &
// -------------------------------------
void
CalendarLimitTest::test(UDate millis, U_NAMESPACE_QUALIFIER Calendar* cal, U_NAMESPACE_QUALIFIER DateFormat* fmt)
CalendarLimitTest::test(UDate millis, icu::Calendar* cal, icu::DateFormat* fmt)
{
static const UDate kDrift = 1e-10;
UErrorCode exception = U_ZERO_ERROR;

40
icu4c/source/test/intltest/strtest.cpp
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2010, International Business Machines Corporation and
* Copyright (c) 1997-2011, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/* file name: strtest.cpp
@ -162,8 +162,6 @@ void StringTest::runIndexedTest(int32_t index, UBool exec, const char *&name, ch
TESTCASE_AUTO(Test_UNICODE_STRING_SIMPLE);
TESTCASE_AUTO(Test_UTF8_COUNT_TRAIL_BYTES);
TESTCASE_AUTO(TestSTLCompatibility);
TESTCASE_AUTO(TestStdNamespaceQualifier);
TESTCASE_AUTO(TestUsingStdNamespace);
TESTCASE_AUTO(TestStringPiece);
TESTCASE_AUTO(TestStringPieceComparisons);
TESTCASE_AUTO(TestByteSink);
@ -173,36 +171,6 @@ void StringTest::runIndexedTest(int32_t index, UBool exec, const char *&name, ch
TESTCASE_AUTO_END;
}
// Syntax check for the correct namespace qualifier for the standard string class.
void
StringTest::TestStdNamespaceQualifier() {
#if U_HAVE_STD_STRING
U_STD_NSQ string s="abc xyz";
U_STD_NSQ string t="abc";
t.append(" ");
t.append("xyz");
if(s!=t) {
errln("standard string concatenation error: %s != %s", s.c_str(), t.c_str());
}
#endif
}
void
StringTest::TestUsingStdNamespace() {
#if U_HAVE_STD_STRING
// Now test that "using namespace std;" is defined correctly.
U_STD_NS_USE
string s="abc xyz";
string t="abc";
t.append(" ");
t.append("xyz");
if(s!=t) {
errln("standard string concatenation error: %s != %s", s.c_str(), t.c_str());
}
#endif
}
void
StringTest::TestStringPiece() {
// Default constructor.
@ -229,7 +197,7 @@ StringTest::TestStringPiece() {
}
#if U_HAVE_STD_STRING
// Construct from std::string.
U_STD_NSQ string uvwxyz_string("uvwxyz");
std::string uvwxyz_string("uvwxyz");
StringPiece uvwxyz(uvwxyz_string);
if(uvwxyz.empty() || uvwxyz.data()!=uvwxyz_string.data() || uvwxyz.length()!=6 || uvwxyz.size()!=6) {
errln("StringPiece(uvwxyz_string) failed");
@ -481,8 +449,8 @@ StringTest::TestStringByteSink() {
#if U_HAVE_STD_STRING
// Not much to test because only the constructor and Append()
// are implemented, and trivially so.
U_STD_NSQ string result("abc"); // std::string
StringByteSink<U_STD_NSQ string> sink(&result);
std::string result("abc"); // std::string
StringByteSink<std::string> sink(&result);
sink.Append("def", 3);
if(result != "abcdef") {
errln("StringByteSink did not Append() as expected");

4
icu4c/source/test/intltest/strtest.h
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2010, International Business Machines Corporation and
* Copyright (c) 1997-2011, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/* file name: strtest.h
@ -38,8 +38,6 @@ private:
void Test_UNICODE_STRING();
void Test_UNICODE_STRING_SIMPLE();
void Test_UTF8_COUNT_TRAIL_BYTES();
void TestStdNamespaceQualifier();
void TestUsingStdNamespace();
void TestStringPiece();
void TestStringPieceComparisons();
void TestByteSink();

12
icu4c/source/test/intltest/ustrtest.cpp
View File

@ -1758,7 +1758,6 @@ UnicodeStringTest::TestStringEnumeration() {
*
* Define a (bogus) UnicodeString class in another namespace and check for ambiguity.
*/
#if U_HAVE_NAMESPACE
namespace bogus {
class UnicodeString {
public:
@ -1771,11 +1770,9 @@ namespace bogus {
int32_t i;
};
}
#endif
void
UnicodeStringTest::TestNameSpace() {
#if U_HAVE_NAMESPACE
// Provoke name collision unless the UnicodeString macros properly
// qualify the icu::UnicodeString class.
using namespace bogus;
@ -1790,7 +1787,6 @@ UnicodeStringTest::TestNameSpace() {
if(s4.length()!=9) {
errln("Something wrong with UnicodeString::operator+().");
}
#endif
}
void
@ -1870,7 +1866,7 @@ UnicodeStringTest::TestUTF8() {
errln("UnicodeString::fromUTF8(StringPiece) did not create the expected string.");
}
#if U_HAVE_STD_STRING
U_STD_NSQ string utf8_string((const char *)utf8, sizeof(utf8));
std::string utf8_string((const char *)utf8, sizeof(utf8));
UnicodeString from8b = UnicodeString::fromUTF8(utf8_string);
if(from8b != expected) {
errln("UnicodeString::fromUTF8(std::string) did not create the expected string.");
@ -1899,10 +1895,10 @@ UnicodeStringTest::TestUTF8() {
}
#if U_HAVE_STD_STRING
// Initial contents for testing that toUTF8String() appends.
U_STD_NSQ string result8 = "-->";
U_STD_NSQ string expected8 = "-->" + U_STD_NSQ string((const char *)expected_utf8, sizeof(expected_utf8));
std::string result8 = "-->";
std::string expected8 = "-->" + std::string((const char *)expected_utf8, sizeof(expected_utf8));
// Use the return value just for testing.
U_STD_NSQ string &result8r = us.toUTF8String(result8);
std::string &result8r = us.toUTF8String(result8);
if(result8r != expected8 || &result8r != &result8) {
errln("UnicodeString::toUTF8String() did not create the expected string.");
}

4
icu4c/source/test/intltest/uts46test.cpp
View File

@ -827,8 +827,8 @@ void UTS46Test::TestSomeCases() {
}
// UTF-8 if we have std::string
#if U_HAVE_STD_STRING
U_STD_NSQ string input8, aT8, uT8, aN8, uN8;
StringByteSink<U_STD_NSQ string> aT8Sink(&aT8), uT8Sink(&uT8), aN8Sink(&aN8), uN8Sink(&uN8);
std::string input8, aT8, uT8, aN8, uN8;
StringByteSink<std::string> aT8Sink(&aT8), uT8Sink(&uT8), aN8Sink(&aN8), uN8Sink(&uN8);
IDNAInfo aT8Info, uT8Info, aN8Info, uN8Info;
input.toUTF8String(input8);
trans->nameToASCII_UTF8(input8, aT8Sink, aT8Info, errorCode);

3
icu4c/source/tools/genrb/wrtjava.c
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2000-2009, International Business Machines
* Copyright (C) 2000-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -27,7 +27,6 @@
#include "unicode/ucnv.h"
#include "genrb.h"
#include "rle.h"
#include "ucol_tok.h"
#include "uhash.h"
#include "uresimp.h"
#include "unicode/ustring.h"

16
icu4c/source/tools/genren/genren.pl
View File

@ -178,9 +178,9 @@ for(;@ARGV; shift(@ARGV)) {
} elsif($CppName[0] =~ /^~/) {
&verbose ("Skipping C++ destructor: $_\n");
} else {
&verbose( " Class: '$CppName[0]': $_ \n");
$CppClasses{$CppName[0]}++;
$symbolCount++;
&verbose( "Skipping C++ class: '$CppName[0]': $_ \n");
# $CppClasses{$CppName[0]}++;
# $symbolCount++;
}
} elsif ( my ($cfn) = m/^([A-Za-z0-9_]*)\(.*/ ) {
&verbose ( "$ARGV[0]: got global C++ function $cfn with '$_'\n" );
@ -228,15 +228,6 @@ foreach(sort keys(%CFuncs)) {
# print HEADER "#define $_ $_$U_ICU_VERSION_SUFFIX\n";
}
print HEADER "\n\n";
print HEADER "/* C++ class names renaming defines */\n\n";
print HEADER "#ifdef XP_CPLUSPLUS\n";
print HEADER "#if !U_HAVE_NAMESPACE\n\n";
foreach(sort keys(%CppClasses)) {
print HEADER "#define $_ U_ICU_ENTRY_POINT_RENAME($_)\n";
}
print HEADER "\n#endif\n";
print HEADER "#endif\n";
print HEADER "\n#endif\n";
print HEADER "\n#endif\n";
@ -264,4 +255,3 @@ EndHelpText
exit 0;
}

14
icu4c/source/tools/toolutil/dbgutil.h
View File

@ -1,7 +1,7 @@
/*
************************************************************************
* Copyright (c) 2007-2010, International Business Machines
* Copyright (c) 2007-2011, International Business Machines
* Corporation and others. All Rights Reserved.
************************************************************************
*/
@ -17,26 +17,26 @@
#if !UCONFIG_NO_FORMATTING
U_CAPI const U_NAMESPACE_QUALIFIER UnicodeString& U_EXPORT2
U_CAPI const icu::UnicodeString& U_EXPORT2
udbg_enumString(UDebugEnumType type, int32_t field);
/**
* @return enum offset, or UDBG_INVALID_ENUM on error
*/
U_CAPI int32_t U_EXPORT2
udbg_enumByString(UDebugEnumType type, const U_NAMESPACE_QUALIFIER UnicodeString& string);
udbg_enumByString(UDebugEnumType type, const icu::UnicodeString& string);
/**
* Convert a UnicodeString (with ascii digits) into a number.
* @param s string
* @return numerical value, or 0 on error
*/
U_CAPI int32_t U_EXPORT2 udbg_stoi(const U_NAMESPACE_QUALIFIER UnicodeString &s);
U_CAPI int32_t U_EXPORT2 udbg_stoi(const icu::UnicodeString &s);
U_CAPI double U_EXPORT2 udbg_stod(const U_NAMESPACE_QUALIFIER UnicodeString &s);
U_CAPI double U_EXPORT2 udbg_stod(const icu::UnicodeString &s);
U_CAPI U_NAMESPACE_QUALIFIER UnicodeString * U_EXPORT2
udbg_escape(const U_NAMESPACE_QUALIFIER UnicodeString &s, U_NAMESPACE_QUALIFIER UnicodeString *dst);
U_CAPI icu::UnicodeString * U_EXPORT2
udbg_escape(const icu::UnicodeString &s, icu::UnicodeString *dst);
#endif

6
icu4c/source/tools/toolutil/pkg_icu.h
View File

@ -1,5 +1,5 @@
/******************************************************************************
* Copyright (C) 2008-2009, International Business Machines
* Copyright (C) 2008-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/
@ -13,10 +13,10 @@
U_CAPI int U_EXPORT2
writePackageDatFile(const char *outFilename, const char *outComment,
const char *sourcePath, const char *addList, U_NAMESPACE_QUALIFIER Package *pkg,
const char *sourcePath, const char *addList, icu::Package *pkg,
char outType);
U_CAPI U_NAMESPACE_QUALIFIER Package * U_EXPORT2
U_CAPI icu::Package * U_EXPORT2
readList(const char *filesPath, const char *listname, UBool readContents);
#endif

4
icu4c/source/tools/toolutil/pkgitems.cpp
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2010, International Business Machines
* Copyright (C) 2003-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -390,7 +390,7 @@ ures_enumDependencies(const char *itemName, const UDataInfo *pInfo,
}
}
U_NAMESPACE_QUALIFIER NativeItem nativePool;
icu::NativeItem nativePool;
if(resData.usesPoolBundle) {
char poolName[200];