1 files changed, 27 insertions, 26 deletions

diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index 379542896d3..0df20b71a25 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -31,30 +31,29 @@ public:
     Application(SignalPolicy = ICE_ENUM(SignalPolicy, HandleSignals));
     virtual ~Application();
 
-    //
     // This main() must be called by the global main(). main()
-    // initializes the Communicator, calls run() as a template method,
-    // and destroys the Communicator upon return from run(). It
-    // thereby handles all exceptions properly, i.e., error messages
-    // are printed if exceptions propagate to main(), and the
-    // Communicator is always destroyed, regardless of exceptions.
+    // initializes the Communicator, calls run() and destroys the
+    // the Communicator upon return from run(). It handles all
+    // exceptions properly, i.e., error message are printed if
+    // exceptions propagate to main(), and the Communicator is always
+    // destroyed, regardless of exceptions.
     //
-    int main(int, char*[], const Ice::InitializationData& = Ice::InitializationData());
-    int main(int, char*[], const char*);
-
-    int main(int, char* const [], const Ice::InitializationData& = Ice::InitializationData());
-    int main(int, char* const [], const char*);
+    int main(int, const char* const[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION);
+    int main(int, const char* const[], ICE_CONFIG_FILE_STRING, int = ICE_INT_VERSION);
 
-#ifdef _WIN32
+#   ifdef _WIN32
+    int main(int, const wchar_t* const[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION);
+    int main(int, const wchar_t* const[], ICE_CONFIG_FILE_STRING, int = ICE_INT_VERSION);
+#   endif
 
-    int main(int, wchar_t*[], const Ice::InitializationData& = Ice::InitializationData());
-    int main(int, wchar_t*[], const char*);
-
-#endif
-
-    int main(const StringSeq&, const Ice::InitializationData& = Ice::InitializationData());
-    int main(const StringSeq&, const char*);
+    int main(const StringSeq&, const InitializationData& = InitializationData(), int = ICE_INT_VERSION);
+    int main(const StringSeq&, ICE_CONFIG_FILE_STRING, int = ICE_INT_VERSION);
 
+    //
+    // run is given a copy of the remaining argc/argv arguments,
+    // after the communicator initialization in the caller (main)
+    // has removed all Ice-related arguments.
+    //
     virtual int run(int, char*[]) = 0;
 
     //
@@ -114,7 +113,7 @@ public:
 
 protected:
 
-    virtual int doMain(int, char*[], const Ice::InitializationData&);
+    virtual int doMain(int, char*[], const InitializationData&, Int);
 
     //
     // _mutex and _condVar are used to synchronize the main thread and
@@ -124,21 +123,23 @@ protected:
     static IceUtil::Cond _condVar;
 
     //
-    // Variables than can change while run() and communicator->destroy() are running!
+    // Variables than can change while run() and communicator->destroy()
+    //  are running!
     //
     static bool _callbackInProgress;
     static bool _destroyed;
     static bool _interrupted;
 
     //
-    // Variables that are immutable during run() and until communicator->destroy() has returned;
-    // before and after run(), and once communicator->destroy() has returned, we assume that
+    // Variables that are immutable during run() and until
+    // communicator->destroy() has returned, before and after run(), and
+    // once communicator->destroy() has returned, we assume that
     // only the main thread and CtrlCHandler threads are running.
     //
     static std::string _appName;
-    static Ice::CommunicatorPtr _communicator;
-    static Ice::SignalPolicy _signalPolicy;
-    static Ice::Application* _application;
+    static CommunicatorPtr _communicator;
+    static SignalPolicy _signalPolicy;
+    static Application* _application;
 
 private: