1 files changed, 0 insertions, 132 deletions
diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp
index f122084eb68..dc029626c4f 100644
--- a/cpp/src/IceUtil/StringConverter.cpp
+++ b/cpp/src/IceUtil/StringConverter.cpp
@@ -238,27 +238,6 @@ public:
 
 #endif
 
-#ifdef _WIN32
-
-//
-// Converts to/from UTF-8 using MultiByteToWideChar and WideCharToMultiByte
-//
-class WindowsStringConverter : public StringConverter
-{
-public:
-
-    explicit WindowsStringConverter(unsigned int);
-
-    virtual Byte* toUTF8(const char*, const char*, UTF8Buffer&) const;
-
-    virtual void fromUTF8(const Byte*, const Byte*, string& target) const;
-
-private:
-    unsigned int _cp;
-};
-#endif
-
-
 class Init
 {
 public:
@@ -324,108 +303,6 @@ private:
     string _buffer;
 };
 
-#ifdef _WIN32
-WindowsStringConverter::WindowsStringConverter(unsigned int cp) :
-    _cp(cp)
-{
-}
-
-Byte*
-WindowsStringConverter::toUTF8(const char* sourceStart, const char* sourceEnd, UTF8Buffer& buffer) const
-{
-    //
-    // First convert to UTF-16
-    //
-    int sourceSize = static_cast<int>(sourceEnd - sourceStart);
-    if(sourceSize == 0)
-    {
-        return buffer.getMoreBytes(1, 0);
-    }
-
-    int writtenWchar = 0;
-    wstring wbuffer;
-
-    //
-    // The following code pages doesn't support MB_ERR_INVALID_CHARS flag
-    // see http://msdn.microsoft.com/en-us/library/windows/desktop/dd319072(v=vs.85).aspx
-    //
-    DWORD flags =
-        (_cp == 50220 || _cp == 50221 || _cp == 50222 ||
-         _cp == 50225 || _cp == 50227 || _cp == 50229 ||
-         _cp == 65000 || _cp == 42 || (_cp >= 57002 && _cp <= 57011)) ? 0 : MB_ERR_INVALID_CHARS;
-
-    do
-    {
-        wbuffer.resize(wbuffer.size() == 0 ? sourceSize + 2 : 2 * wbuffer.size());
-        writtenWchar = MultiByteToWideChar(_cp, flags, sourceStart, sourceSize,
-                                           const_cast<wchar_t*>(wbuffer.data()), static_cast<int>(wbuffer.size()));
-    } while(writtenWchar == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER);
-
-    if(writtenWchar == 0)
-    {
-        throw IllegalConversionException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
-    }
-
-    wbuffer.resize(static_cast<size_t>(writtenWchar));
-
-    //
-    // Then convert this UTF-16 wbuffer into UTF-8
-    //
-    return getUnicodeWstringConverter()->toUTF8(wbuffer.data(), wbuffer.data() + wbuffer.size(), buffer);
-}
-
-void
-WindowsStringConverter::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd, string& target) const
-{
-    if(sourceStart == sourceEnd)
-    {
-        target = "";
-        return;
-    }
-
-    if(_cp == CP_UTF8)
-    {
-        string tmp(reinterpret_cast<const char*>(sourceStart), sourceEnd - sourceStart);
-        tmp.swap(target);
-        return;
-    }
-
-    //
-    // First convert to wstring (UTF-16)
-    //
-    wstring wtarget;
-    getUnicodeWstringConverter()->fromUTF8(sourceStart, sourceEnd, wtarget);
-
-    //
-    // WC_ERR_INVALID_CHARS conversion flag is only supported with 65001 (UTF-8) and
-    // 54936 (GB18030 Simplified Chinese)
-    //
-    DWORD flags = (_cp == 65001 || _cp == 54936) ? WC_ERR_INVALID_CHARS : 0;
-
-    //
-    // And then to a multi-byte narrow string
-    //
-    int writtenChar = -1;
-    do
-    {
-        target.resize(writtenChar == -1 ?
-                      std::max<size_t>(sourceEnd - sourceStart + 2, target.size()) :
-                      2 * target.size());
-
-        writtenChar = WideCharToMultiByte(_cp, flags, wtarget.data(), static_cast<int>(wtarget.size()),
-                                          const_cast<char*>(target.data()), static_cast<int>(target.size()),
-                                          0, 0);
-    } while(writtenChar == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER);
-
-    if(writtenChar == 0)
-    {
-        throw IllegalConversionException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
-    }
-
-    target.resize(static_cast<size_t>(writtenChar));
-}
-#endif
-
 }
 
 IceUtil::UTF8Buffer::~UTF8Buffer()
@@ -439,15 +316,6 @@ IceUtil::createUnicodeWstringConverter()
     return getUnicodeWstringConverter();
 }
 
-#ifdef _WIN32
-StringConverterPtr
-IceUtil::createWindowsStringConverter(unsigned int cp)
-{
-    return ICE_MAKE_SHARED(WindowsStringConverter, cp);
-}
-#endif
-
-
 StringConverterPtr
 IceUtil::getProcessStringConverter()
 {