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

ICU-7273 namespace fix

Browse Source 
X-SVN-Rev: 27366
This commit is contained in:
Markus Scherer 2010-01-21 23:28:30 +00:00
parent 0b60a8c224
commit a31a559ede
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 UnicodeString &s, UErrorCode &errorCode) {
uprv_checkCanGetBuffer(const U_NAMESPACE_QUALIFIER UnicodeString &s, UErrorCode &errorCode) {
if(U_SUCCESS(errorCode) && s.isBogus()) {
errorCode=U_ILLEGAL_ARGUMENT_ERROR;
}

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

@ -36,6 +36,8 @@
#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
U_NAMESPACE_USE
/* cleanup ------------------------------------------------------------------ */
static const UBiDiProps *gBdp=NULL;

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

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2009, International Business Machines
* Copyright (C) 2003-2010, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -35,6 +35,8 @@
#include "unormimp.h"
#include "ubidi_props.h"
U_NAMESPACE_USE
U_CDECL_BEGIN
/*

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

@ -39,6 +39,8 @@
#include "unicode/caniter.h"
#include "cmemory.h"
U_NAMESPACE_USE
static uint32_t uprv_uca_processContraction(CntTable *contractions, UCAElements *element, uint32_t existingCE, UErrorCode *status);
U_CDECL_BEGIN

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

@ -270,7 +270,7 @@ minimum number for special Jamo
#ifdef XP_CPLUSPLUS
typedef struct collIterate : public UMemory {
typedef struct collIterate : public U_NAMESPACE_QUALIFIER UMemory {
const UChar *string; /* Original string */
/* UChar *start; Pointer to the start of the source string. Either points to string
or to writableBuffer */
@ -285,10 +285,10 @@ typedef struct collIterate : public UMemory {
int32_t offsetRepeatCount; /* Repeat stored offset if non-zero */
int32_t offsetRepeatValue; /* offset value to repeat */
UnicodeString writableBuffer;
U_NAMESPACE_QUALIFIER UnicodeString writableBuffer;
const UChar *fcdPosition; /* Position in the original string to continue FCD check from. */
const UCollator *coll;
const Normalizer2 *nfd;
const U_NAMESPACE_QUALIFIER Normalizer2 *nfd;
uint8_t flags;
uint8_t origFlags;
uint32_t *extendCEs; /* This is use if CEs is not big enough */
@ -352,7 +352,7 @@ typedef struct UCollationPCE UCollationPCE;
U_NAMESPACE_END
struct UCollationElements : public UMemory
struct UCollationElements : public U_NAMESPACE_QUALIFIER UMemory
{
/**
* Struct wrapper for source data
@ -373,12 +373,11 @@ struct UCollationElements : public UMemory
U_NAMESPACE_QUALIFIER UCollationPCE *pce;
};
#endif
U_CAPI void U_EXPORT2
uprv_init_pce(const struct UCollationElements *elems);
#endif
#define UCOL_LEVELTERMINATOR 1
/* mask off anything but primary order */

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

@ -61,7 +61,7 @@ struct UStringSearch {
struct USearch *search;
struct UPattern pattern;
const UCollator *collator;
const Normalizer2 *nfd;
const U_NAMESPACE_QUALIFIER Normalizer2 *nfd;
// positions within the collation element iterator is used to determine
// if we are at the start of the text.
UCollationElements *textIter;