diff options
author | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 11:10:57 +0800 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 11:10:57 +0800 |
commit | e47e08887c823824bfc36f102c065075737394b1 (patch) | |
tree | dcbb175cb6ba3204ac55a06d61d28c488227ab4f /cpp/src/Ice/Application.cpp | |
parent | Revert "4171 - Global namespace pollution" (diff) | |
download | ice-e47e08887c823824bfc36f102c065075737394b1.tar.bz2 ice-e47e08887c823824bfc36f102c065075737394b1.tar.xz ice-e47e08887c823824bfc36f102c065075737394b1.zip |
Revert "Changes for bug 3962 and 4714"
This reverts commit d38ad95e45c0083d602a43e6d77e6c1599f324fe.
Diffstat (limited to 'cpp/src/Ice/Application.cpp')
-rw-r--r-- | cpp/src/Ice/Application.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index cb411293e5a..cc9a2b1e00d 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -384,34 +384,6 @@ Ice::Application::main(int argc, char* argv[], const char* configFile, const Ice return mainInternal(argc, argv, initData, overrideProps); } -#ifdef _WIN32 - -int -Ice::Application::main(int argc, wchar_t* argv[]) -{ - return main(argsToStringSeq(argc, argv)); -} - -int -Ice::Application::main(int argc, wchar_t* argv[], const char* config) -{ - return main(argsToStringSeq(argc, argv), config); -} - -int -Ice::Application::main(int argc, wchar_t* argv[], const char* config, const Ice::PropertiesPtr& properties) -{ - return main(argsToStringSeq(argc, argv), config, properties); -} - -int -Ice::Application::main(int argc, wchar_t* argv[], const Ice::InitializationData& initData) -{ - return main(argsToStringSeq(argc, argv, initData.stringConverter), initData); -} - -#endif - int Ice::Application::main(int argc, char* argv[], const InitializationData& initData) { |