From 07a175a08494ee2cf27affb8d81faa907f0f4b87 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Thu, 1 May 2008 20:54:01 -0400 Subject: Fixed bug #3060 --- cpp/src/IceUtil/Unicode.cpp | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'cpp/src/IceUtil/Unicode.cpp') 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(&str), flags); -} - -basic_string<__wchar_t> -IceUtil::stringToNativeWstring(const string& str, ConversionFlags flags) -{ - return reinterpret_cast& >(stringToWstring(str, flags)); -} -# else -string -IceUtil::wstringToString(const basic_string& str, ConversionFlags flags) -{ - return wstringToString(*reinterpret_cast(&str), flags); -} - -basic_string -IceUtil::stringToTypedefWstring(const string& str, ConversionFlags flags) -{ - return reinterpret_cast& >(stringToWstring(str, flags)); -} - -# endif -#endif -- cgit v1.2.3