diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-12-21 11:12:14 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-12-21 11:12:14 -0500 |
| commit | 08ec7524df324e627bbb8d93c509f0d90badbe3b (patch) | |
| tree | a640ae99a5e35b210352150feef4f71832b265c5 /cpp/src/IceUtil/ConvertUTF.h | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.tar.bz2 ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.tar.xz ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.zip | |
IceUtil cleanup (first commit)
Diffstat (limited to 'cpp/src/IceUtil/ConvertUTF.h')
| -rwxr-xr-x | cpp/src/IceUtil/ConvertUTF.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h index a70e62fd1a9..72ee21c3b06 100755 --- a/cpp/src/IceUtil/ConvertUTF.h +++ b/cpp/src/IceUtil/ConvertUTF.h @@ -102,7 +102,7 @@ bit mask & shift operations. ------------------------------------------------------------------------ */ -namespace IceUtil +namespace IceUtilInternal { typedef unsigned int UTF32; /* at least 32 bits */ @@ -118,19 +118,19 @@ typedef bool Boolean; /* 0 or 1 */ #define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF -ConversionResult ConvertUTF8toUTF16( +IceUtil::ConversionResult ConvertUTF8toUTF16( const UTF8** sourceStart, const UTF8* sourceEnd, UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags); -ConversionResult ConvertUTF16toUTF8 ( +IceUtil::ConversionResult ConvertUTF16toUTF8 ( const UTF16** sourceStart, const UTF16* sourceEnd, UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags); -ConversionResult ConvertUTF8toUTF32( +IceUtil::ConversionResult ConvertUTF8toUTF32( const UTF8** sourceStart, const UTF8* sourceEnd, UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags); -ConversionResult ConvertUTF32toUTF8( +IceUtil::ConversionResult ConvertUTF32toUTF8( const UTF32** sourceStart, const UTF32* sourceEnd, UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags); |