diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-05-01 20:54:01 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-05-01 20:54:01 -0400 |
| commit | 07a175a08494ee2cf27affb8d81faa907f0f4b87 (patch) | |
| tree | 36ada07d767b49fcb99cc50701bc43baa9f7ff18 /cpp/src/IceUtil | |
| parent | minor update to cs/INSTALL.VISUAL_C# (diff) | |
| download | ice-07a175a08494ee2cf27affb8d81faa907f0f4b87.tar.bz2 ice-07a175a08494ee2cf27affb8d81faa907f0f4b87.tar.xz ice-07a175a08494ee2cf27affb8d81faa907f0f4b87.zip | |
Fixed bug #3060
Diffstat (limited to 'cpp/src/IceUtil')
| -rw-r--r-- | cpp/src/IceUtil/Unicode.cpp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp index 8476ece1afd..5a8304df18e 100644 --- a/cpp/src/IceUtil/Unicode.cpp +++ b/cpp/src/IceUtil/Unicode.cpp @@ -236,37 +236,3 @@ IceUtil::stringToWstring(const string& str, ConversionFlags flags) } return result; } - - -#if defined(_MSC_VER) && (_MSC_VER >= 1300) -// -// See comments in IceUtil/Unicode.h -// - -# if _MSC_VER < 1400 -string -IceUtil::wstringToString(const basic_string<__wchar_t>& str, ConversionFlags flags) -{ - return wstringToString(*reinterpret_cast<const wstring*>(&str), flags); -} - -basic_string<__wchar_t> -IceUtil::stringToNativeWstring(const string& str, ConversionFlags flags) -{ - return reinterpret_cast<basic_string<__wchar_t>& >(stringToWstring(str, flags)); -} -# else -string -IceUtil::wstringToString(const basic_string<unsigned short>& str, ConversionFlags flags) -{ - return wstringToString(*reinterpret_cast<const wstring*>(&str), flags); -} - -basic_string<unsigned short> -IceUtil::stringToTypedefWstring(const string& str, ConversionFlags flags) -{ - return reinterpret_cast<basic_string<unsigned short>& >(stringToWstring(str, flags)); -} - -# endif -#endif |