X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/729e4ab9bc6618bc3d8a898e575df7f4019e29ca..ba516feee23ef0c2b810ac6365e88f33807caaa8:/icuSources/common/cpputils.h diff --git a/icuSources/common/cpputils.h b/icuSources/common/cpputils.h index e423900d..b2e0cbc8 100644 --- a/icuSources/common/cpputils.h +++ b/icuSources/common/cpputils.h @@ -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; }