From 48b141f8f6a8603f6b13a85bde002f6b480832f7 Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Fri, 3 Jun 2016 14:11:48 -0400
Subject: Refactored string converters and use codecvt_utf8[_utf16] when
 available instead of ConvertUTF

---
 cpp/src/slice2objc/Gen.cpp | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'cpp/src/slice2objc/Gen.cpp')

diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp
index 6659b98ebbf..28c0b04cbe8 100644
--- a/cpp/src/slice2objc/Gen.cpp
+++ b/cpp/src/slice2objc/Gen.cpp
@@ -17,7 +17,7 @@
 #include <direct.h>
 #endif
 #include <IceUtil/Iterator.h>
-#include <IceUtil/Unicode.h>
+#include <IceUtil/StringConverter.h>
 #include <IceUtil/InputUtil.h>
 #include <IceUtil/UUID.h>
 #include <Slice/Checksum.h>
@@ -1589,23 +1589,7 @@ Slice::Gen::TypesVisitor::writeConstantValue(IceUtilInternal::Output& out, const
                             vector<unsigned int> u32buffer;
                             u32buffer.push_back(static_cast<unsigned int>(v));
 
-                            vector<unsigned char> u8buffer;
-
-                            IceUtilInternal::ConversionResult result = convertUTF32ToUTF8(u32buffer, u8buffer, IceUtil::lenientConversion);
-                            switch(result)
-                            {
-                                case conversionOK:
-                                    break;
-                                case sourceExhausted:
-                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
-                                case sourceIllegal:
-                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
-                                default:
-                                {
-                                    assert(0);
-                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
-                                }
-                            }
+                            vector<unsigned char> u8buffer = fromUTF32(u32buffer);
 
                             ostringstream s;
                             for(vector<unsigned char>::const_iterator q = u8buffer.begin(); q != u8buffer.end(); ++q)
-- 
cgit v1.2.3