summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil/Unicode.h
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-03-10 09:33:14 +0100
committerJose <jose@zeroc.com>2016-03-10 09:33:14 +0100
commit709f8a26f7ac03bed5a4d1a0b9de6c4e9d14f806 (patch)
tree0665aa227fce4c4c369619fb2ea1d9f718979655 /cpp/src/IceUtil/Unicode.h
parentWindows PHP build fixes (diff)
downloadice-709f8a26f7ac03bed5a4d1a0b9de6c4e9d14f806.tar.bz2
ice-709f8a26f7ac03bed5a4d1a0b9de6c4e9d14f806.tar.xz
ice-709f8a26f7ac03bed5a4d1a0b9de6c4e9d14f806.zip
String literals fixes
- Fixed escape sequences in C++ wide strings - Fixed objetive-c escape sequences - Update ruby to use magic comments to set the file encoding
Diffstat (limited to 'cpp/src/IceUtil/Unicode.h')
-rw-r--r--cpp/src/IceUtil/Unicode.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/IceUtil/Unicode.h b/cpp/src/IceUtil/Unicode.h
index 2c96d6c6448..d5c3b235ddb 100644
--- a/cpp/src/IceUtil/Unicode.h
+++ b/cpp/src/IceUtil/Unicode.h
@@ -50,6 +50,10 @@ convertUTF8ToUTF16(const std::vector<unsigned char>&, std::vector<unsigned short
IceUtil::ConversionFlags);
ICE_UTIL_API ConversionResult
+convertUTF8ToUTF32(const std::vector<unsigned char>&, std::vector<unsigned int>&,
+ IceUtil::ConversionFlags);
+
+ICE_UTIL_API ConversionResult
convertUTF32ToUTF8(const std::vector<unsigned int>&, std::vector<unsigned char>&,
IceUtil::ConversionFlags);