summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil/ConvertUTF.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2008-04-18 17:58:23 -0400
committerBernard Normier <bernard@zeroc.com>2008-04-18 17:58:23 -0400
commitcb11f5d824675f9b5aa4e24aef5b0b15daa66385 (patch)
treef2e8582394a2524dd08910c5eb7812d28ed78f0d /cpp/src/IceUtil/ConvertUTF.h
parentMerge branch 'master' of cvs:/home/git/ice (diff)
downloadice-cb11f5d824675f9b5aa4e24aef5b0b15daa66385.tar.bz2
ice-cb11f5d824675f9b5aa4e24aef5b0b15daa66385.tar.xz
ice-cb11f5d824675f9b5aa4e24aef5b0b15daa66385.zip
Fixed bug #2992
Diffstat (limited to 'cpp/src/IceUtil/ConvertUTF.h')
-rw-r--r--cpp/src/IceUtil/ConvertUTF.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h
index 40973ac0e84..89c047b84ee 100644
--- a/cpp/src/IceUtil/ConvertUTF.h
+++ b/cpp/src/IceUtil/ConvertUTF.h
@@ -120,19 +120,19 @@ typedef bool Boolean; /* 0 or 1 */
ConversionResult ConvertUTF8toUTF16(
const UTF8** sourceStart, const UTF8* sourceEnd,
- UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
+ UTF16** targetStart, UTF16* targetEnd, IceUtil::ConversionFlags flags);
ConversionResult ConvertUTF16toUTF8 (
const UTF16** sourceStart, const UTF16* sourceEnd,
- UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
+ UTF8** targetStart, UTF8* targetEnd, IceUtil::ConversionFlags flags);
ConversionResult ConvertUTF8toUTF32(
const UTF8** sourceStart, const UTF8* sourceEnd,
- UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
+ UTF32** targetStart, UTF32* targetEnd, IceUtil::ConversionFlags flags);
ConversionResult ConvertUTF32toUTF8(
const UTF32** sourceStart, const UTF32* sourceEnd,
- UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
+ UTF8** targetStart, UTF8* targetEnd, IceUtil::ConversionFlags flags);
//
// isLegalUTFSequence is declared in IceUtil/Unicode.h