From 402b732fafc7c7ff807865692a0389815e518510 Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Sat, 12 May 2012 00:15:05 +0000 Subject: [PATCH] ICU-9317 Add icu:: to ambiguous uses of StringPiece. X-SVN-Rev: 31818 --- icu4c/source/common/uts46.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/icu4c/source/common/uts46.cpp b/icu4c/source/common/uts46.cpp index 70a97845e15..e4314ed66d1 100644 --- a/icu4c/source/common/uts46.cpp +++ b/icu4c/source/common/uts46.cpp @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 2010-2011, International Business Machines +* Copyright (C) 2010-2012, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * file name: uts46.cpp @@ -1402,7 +1402,10 @@ uidna_labelToASCII_UTF8(const UIDNA *idna, if(!checkArgs(label, length, dest, capacity, pInfo, pErrorCode)) { return 0; } - StringPiece src(label, length<0 ? uprv_strlen(label) : length); + // Note: StringPiece is explicitly qualified because in some build environments there + // exists a separate, non-ICU global ::StringPiece class that causes ambiguity. + // This is needed for all uses of StringPiece outside of U_NAMESPACE_BEGIN ... U_NAMESPACE_END. + icu::StringPiece src(label, length<0 ? uprv_strlen(label) : length); CheckedArrayByteSink sink(dest, capacity); IDNAInfo info; reinterpret_cast(idna)->labelToASCII_UTF8(src, sink, info, *pErrorCode); @@ -1418,7 +1421,7 @@ uidna_labelToUnicodeUTF8(const UIDNA *idna, if(!checkArgs(label, length, dest, capacity, pInfo, pErrorCode)) { return 0; } - StringPiece src(label, length<0 ? uprv_strlen(label) : length); + icu::StringPiece src(label, length<0 ? uprv_strlen(label) : length); CheckedArrayByteSink sink(dest, capacity); IDNAInfo info; reinterpret_cast(idna)->labelToUnicodeUTF8(src, sink, info, *pErrorCode); @@ -1434,7 +1437,7 @@ uidna_nameToASCII_UTF8(const UIDNA *idna, if(!checkArgs(name, length, dest, capacity, pInfo, pErrorCode)) { return 0; } - StringPiece src(name, length<0 ? uprv_strlen(name) : length); + icu::StringPiece src(name, length<0 ? uprv_strlen(name) : length); CheckedArrayByteSink sink(dest, capacity); IDNAInfo info; reinterpret_cast(idna)->nameToASCII_UTF8(src, sink, info, *pErrorCode); @@ -1450,7 +1453,7 @@ uidna_nameToUnicodeUTF8(const UIDNA *idna, if(!checkArgs(name, length, dest, capacity, pInfo, pErrorCode)) { return 0; } - StringPiece src(name, length<0 ? uprv_strlen(name) : length); + icu::StringPiece src(name, length<0 ? uprv_strlen(name) : length); CheckedArrayByteSink sink(dest, capacity); IDNAInfo info; reinterpret_cast(idna)->nameToUnicodeUTF8(src, sink, info, *pErrorCode); -- 2.40.0