Fixed bug 4175 - added char*const argv[] main overload

2 files changed, 13 insertions, 12 deletions

diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 61568f144b3..91b77569524 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -302,12 +302,6 @@ Ice::Application::~Application()
 }
 
 int
-Ice::Application::main(int argc, char* argv[])
-{
-    return main(argc, argv, InitializationData());
-}
-
-int
 Ice::Application::main(int argc, char* argv[], const char* configFile)
 {
     //
@@ -369,7 +363,7 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initDat
             //
             CtrlCHandler ctrCHandler;
             _ctrlCHandler = &ctrCHandler;
-
+            
             status = doMain(argc, argv, initData);
 
             //
@@ -392,11 +386,18 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initDat
     return status;
 }
 
-int
-Ice::Application::main(const StringSeq& args)
+int 
+Ice::Application::main(int argc, char* const argv[], const char* configFile)
 {
-    ArgVector av(args);
-    return main(av.argc, av.argv);
+    ArgVector av(argc, argv);
+    return main(av.argc, av.argv, configFile);
+}
+
+int 
+Ice::Application::main(int argc, char* const argv[], const Ice::InitializationData& initData)
+{
+    ArgVector av(argc, argv);
+    return main(av.argc, av.argv, initData);
 }
 
 int
diff --git a/cpp/src/IceUtil/ArgVector.cpp b/cpp/src/IceUtil/ArgVector.cpp
index 23a67e76372..d08790acaa9 100644
--- a/cpp/src/IceUtil/ArgVector.cpp
+++ b/cpp/src/IceUtil/ArgVector.cpp
@@ -11,7 +11,7 @@
 #include <IceUtil/DisableWarnings.h>
 #include <cstring>
 
-IceUtilInternal::ArgVector::ArgVector(int argc, char *argv[])
+IceUtilInternal::ArgVector::ArgVector(int argc, char* const argv[])
 {
     assert(argc >= 0);
     _args.resize(argc);