diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-03-28 10:06:55 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-03-28 10:06:55 -0400 |
| commit | db5588f918abf3e2c0fa1d52b84077af73921706 (patch) | |
| tree | b5c59119c69631bf20d207823b9db0d536020db7 /cpp/src/IceGrid/IceGridNode.cpp | |
| parent | Fixed ICE-7673 - use continations and await in Ice/dispatcher test (diff) | |
| download | ice-db5588f918abf3e2c0fa1d52b84077af73921706.tar.bz2 ice-db5588f918abf3e2c0fa1d52b84077af73921706.tar.xz ice-db5588f918abf3e2c0fa1d52b84077af73921706.zip | |
ICE-7707 Improved handling of argc/argv arguments
Added configFile overload to Ice::initialize and CommunicatorHolder in C++
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index a701f0bd354..d28f0ec6e4c 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -71,7 +71,7 @@ protected: bool startImpl(int, char*[], int&); virtual void waitForShutdown(); virtual bool stop(); - virtual CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&); + virtual CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&, int); private: @@ -754,7 +754,8 @@ NodeService::stop() CommunicatorPtr NodeService::initializeCommunicator(int& argc, char* argv[], - const InitializationData& initializationData) + const InitializationData& initializationData, + int version) { InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initData.properties); @@ -782,7 +783,7 @@ NodeService::initializeCommunicator(int& argc, char* argv[], // initData.properties->setProperty("Ice.ACM.Close", "3"); - return Service::initializeCommunicator(argc, argv, initData); + return Service::initializeCommunicator(argc, argv, initData, version); } void |