diff options
| author | Jose <jose@zeroc.com> | 2016-03-08 22:09:37 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-08 22:09:37 +0100 |
| commit | cfa587bc0be11012b9ab4e8fd333e96080eb71e2 (patch) | |
| tree | 31ecc86af1a9a84d09eb3c62cd302830d02a74ce /cpp/src/IceUtil/Unicode.h | |
| parent | minor fixes to icegriddb/icestormdb (diff) | |
| parent | more icegriddb/icestormdb fixes (diff) | |
| download | ice-cfa587bc0be11012b9ab4e8fd333e96080eb71e2.tar.bz2 ice-cfa587bc0be11012b9ab4e8fd333e96080eb71e2.tar.xz ice-cfa587bc0be11012b9ab4e8fd333e96080eb71e2.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/IceUtil/Unicode.h')
| -rw-r--r-- | cpp/src/IceUtil/Unicode.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/IceUtil/Unicode.h b/cpp/src/IceUtil/Unicode.h index 00333ce8a44..2c96d6c6448 100644 --- a/cpp/src/IceUtil/Unicode.h +++ b/cpp/src/IceUtil/Unicode.h @@ -44,6 +44,15 @@ ConversionResult convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* sourceEnd, std::wstring& target, IceUtil::ConversionFlags flags); + +ICE_UTIL_API ConversionResult +convertUTF8ToUTF16(const std::vector<unsigned char>&, std::vector<unsigned short>&, + IceUtil::ConversionFlags); + +ICE_UTIL_API ConversionResult +convertUTF32ToUTF8(const std::vector<unsigned int>&, std::vector<unsigned char>&, + IceUtil::ConversionFlags); + } #endif |