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/IceBridge/IceBridge.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/IceBridge/IceBridge.cpp')
| -rw-r--r-- | cpp/src/IceBridge/IceBridge.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/IceBridge/IceBridge.cpp b/cpp/src/IceBridge/IceBridge.cpp index 76a3ba0ab5d..326a73a496b 100644 --- a/cpp/src/IceBridge/IceBridge.cpp +++ b/cpp/src/IceBridge/IceBridge.cpp @@ -664,7 +664,7 @@ protected: virtual bool start(int, char*[], int&); virtual bool stop(); - virtual CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&); + virtual CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&, int); private: @@ -784,7 +784,8 @@ BridgeService::stop() } CommunicatorPtr -BridgeService::initializeCommunicator(int& argc, char* argv[], const InitializationData& initializationData) +BridgeService::initializeCommunicator(int& argc, char* argv[], const InitializationData& initializationData, + int version) { InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initializationData.properties); @@ -801,7 +802,7 @@ BridgeService::initializeCommunicator(int& argc, char* argv[], const Initializat initData.properties->setProperty("Ice.RetryIntervals", "-1"); } - return Service::initializeCommunicator(argc, argv, initData); + return Service::initializeCommunicator(argc, argv, initData, version); } void |