From e47e08887c823824bfc36f102c065075737394b1 Mon Sep 17 00:00:00 2001 From: Matthew Newhook Date: Fri, 7 Aug 2009 11:10:57 +0800 Subject: Revert "Changes for bug 3962 and 4714" This reverts commit d38ad95e45c0083d602a43e6d77e6c1599f324fe. --- cpp/src/Ice/Initialize.cpp | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'cpp/src/Ice/Initialize.cpp') diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index da9027b5061..e950b960bb1 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -50,35 +50,6 @@ Ice::argsToStringSeq(int argc, char* argv[]) return result; } -#ifdef _WIN32 - -StringSeq -Ice::argsToStringSeq(int argc, wchar_t* argv[]) -{ - return argsToStringSeq(argc, argv, 0); -} - -StringSeq -Ice::argsToStringSeq(int argc, wchar_t* argv[], const StringConverterPtr& converter) -{ - StringSeq args; - for(int i=0; argv[i] != 0; i++) - { - string value = IceUtil::wstringToString(argv[i]); - if(converter) - { - string tmp; - converter->fromUTF8(reinterpret_cast(value.data()), - reinterpret_cast(value.data() + value.size()), tmp); - value.swap(tmp); - } - args.push_back(value); - } - return args; -} - -#endif - void Ice::stringSeqToArgs(const StringSeq& args, int& argc, char* argv[]) { -- cgit v1.2.3