diff --git a/cpp/include/Ice/Communicator.h b/cpp/include/Ice/Communicator.h index 9fbde3452a6..14888f02bba 100644 --- a/cpp/include/Ice/Communicator.h +++ b/cpp/include/Ice/Communicator.h @@ -405,9 +405,9 @@ namespace Ice IceInternal::ReferencePtr _stringToProxy(const std::string& str) const; IceInternal::ReferencePtr _propertyToProxy(const std::string& property) const; - friend ICE_API CommunicatorPtr initialize(int&, const char*[], const InitializationData&, std::int32_t); - friend ICE_API CommunicatorPtr initialize(StringSeq&, const InitializationData&, std::int32_t); - friend ICE_API CommunicatorPtr initialize(const InitializationData&, std::int32_t); + friend ICE_API CommunicatorPtr initialize(int&, const char*[], const InitializationData&); + friend ICE_API CommunicatorPtr initialize(StringSeq&, const InitializationData&); + friend ICE_API CommunicatorPtr initialize(const InitializationData&); friend ICE_API IceInternal::InstancePtr IceInternal::getInstance(const Ice::CommunicatorPtr&); friend ICE_API IceInternal::TimerPtr IceInternal::getInstanceTimer(const Ice::CommunicatorPtr&); diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 864a872c491..c7e6408aa29 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -358,15 +358,10 @@ namespace Ice * file and in the arguments, the arguments take precedence. * Recognized options are removed from this vector upon return. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - ICE_API CommunicatorPtr initialize( - int& argc, - const char* argv[], - const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); + ICE_API CommunicatorPtr + initialize(int& argc, const char* argv[], const InitializationData& initData = InitializationData()); /** * Initializes a new communicator. @@ -379,17 +374,12 @@ namespace Ice * file and in the arguments, the arguments take precedence. * Recognized options are removed from this vector upon return. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - inline CommunicatorPtr initialize( - int& argc, - char* argv[], - const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION) + inline CommunicatorPtr + initialize(int& argc, char* argv[], const InitializationData& initData = InitializationData()) { - return initialize(argc, const_cast(argv), initData, version); + return initialize(argc, const_cast(argv), initData); } /** @@ -403,12 +393,9 @@ namespace Ice * file and in the arguments, the arguments take precedence. * Recognized options are removed from this vector upon return. * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - ICE_API CommunicatorPtr - initialize(int& argc, const char* argv[], const std::string& configFile, int version = ICE_INT_VERSION); + ICE_API CommunicatorPtr initialize(int& argc, const char* argv[], const std::string& configFile); /** * Initializes a new communicator. @@ -421,14 +408,11 @@ namespace Ice * file and in the arguments, the arguments take precedence. * Recognized options are removed from this vector upon return. * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - inline CommunicatorPtr - initialize(int& argc, char* argv[], const std::string& configFile, int version = ICE_INT_VERSION) + inline CommunicatorPtr initialize(int& argc, char* argv[], const std::string& configFile) { - return initialize(argc, const_cast(argv), configFile, version); + return initialize(argc, const_cast(argv), configFile); } #ifdef _WIN32 @@ -443,15 +427,10 @@ namespace Ice * file and in the arguments, the arguments take precedence. * Recognized options are removed from this vector upon return. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - ICE_API CommunicatorPtr initialize( - int& argc, - const wchar_t* argv[], - const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); + ICE_API CommunicatorPtr + initialize(int& argc, const wchar_t* argv[], const InitializationData& initData = InitializationData()); /** * Initializes a new communicator. @@ -464,17 +443,12 @@ namespace Ice * file and in the arguments, the arguments take precedence. * Recognized options are removed from this vector upon return. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - inline CommunicatorPtr initialize( - int& argc, - wchar_t* argv[], - const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION) + inline CommunicatorPtr + initialize(int& argc, wchar_t* argv[], const InitializationData& initData = InitializationData()) { - return initialize(argc, const_cast(argv), initData, version); + return initialize(argc, const_cast(argv), initData); } /** @@ -488,12 +462,9 @@ namespace Ice * file and in the arguments, the arguments take precedence. * Recognized options are removed from this vector upon return. * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - ICE_API CommunicatorPtr - initialize(int& argc, const wchar_t* argv[], const std::string& configFile, int version = ICE_INT_VERSION); + ICE_API CommunicatorPtr initialize(int& argc, const wchar_t* argv[], const std::string& configFile); /** * Initializes a new communicator. @@ -506,14 +477,11 @@ namespace Ice * file and in the arguments, the arguments take precedence. * Recognized options are removed from this vector upon return. * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - inline CommunicatorPtr - initialize(int& argc, wchar_t* argv[], const std::string& configFile, int version = ICE_INT_VERSION) + inline CommunicatorPtr initialize(int& argc, wchar_t* argv[], const std::string& configFile) { - return initialize(argc, const_cast(argv), configFile, version); + return initialize(argc, const_cast(argv), configFile); } #endif @@ -526,14 +494,9 @@ namespace Ice * file and in the arguments, the arguments take precedence. * Recognized options are removed from this container upon return. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - ICE_API CommunicatorPtr initialize( - StringSeq& seq, - const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); + ICE_API CommunicatorPtr initialize(StringSeq& seq, const InitializationData& initData = InitializationData()); /** * Initializes a new communicator. @@ -544,30 +507,23 @@ namespace Ice * file and in the arguments, the arguments take precedence. * Recognized options are removed from this container upon return. * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - ICE_API CommunicatorPtr initialize(StringSeq& seq, const std::string& configFile, int version = ICE_INT_VERSION); + ICE_API CommunicatorPtr initialize(StringSeq& seq, const std::string& configFile); /** * Initializes a new communicator. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - ICE_API CommunicatorPtr - initialize(const InitializationData& initData = InitializationData(), int version = ICE_INT_VERSION); + ICE_API CommunicatorPtr initialize(const InitializationData& initData = InitializationData()); /** * Initializes a new communicator. * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator. */ - ICE_API CommunicatorPtr initialize(const std::string& configFile, int version = ICE_INT_VERSION); + ICE_API CommunicatorPtr initialize(const std::string& configFile); /** * Obtains the per-process logger. This logger is used by all communicators that do not have their diff --git a/cpp/include/Ice/Service.h b/cpp/include/Ice/Service.h index d7e25174cf0..f68b51b3af7 100644 --- a/cpp/include/Ice/Service.h +++ b/cpp/include/Ice/Service.h @@ -60,15 +60,9 @@ namespace Ice * @param argc Specifies the number of arguments in argv. * @param argv The command-line arguments. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS. */ - int main( - int argc, - const char* const argv[], - const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); + int main(int argc, const char* const argv[], const InitializationData& initData = InitializationData()); #ifdef _WIN32 /** @@ -92,15 +86,9 @@ namespace Ice * @param argc Specifies the number of arguments in argv. * @param argv The command-line arguments. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS. */ - int main( - int argc, - const wchar_t* const argv[], - const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); + int main(int argc, const wchar_t* const argv[], const InitializationData& initData = InitializationData()); #endif /** @@ -123,14 +111,9 @@ namespace Ice * * @param args The command-line arguments. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS. */ - int main( - const StringSeq& args, - const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); + int main(const StringSeq& args, const InitializationData& initData = InitializationData()); /** * Obtains the communicator created by the service. @@ -177,15 +160,9 @@ namespace Ice * @param argc Specifies the number of arguments in argv. * @param argv The command-line arguments. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS. */ - int - run(int argc, - const wchar_t* const argv[], - const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); + int run(int argc, const wchar_t* const argv[], const InitializationData& initData = InitializationData()); #endif /** @@ -199,15 +176,9 @@ namespace Ice * @param argc Specifies the number of arguments in argv. * @param argv The command-line arguments. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS. */ - int - run(int argc, - const char* const argv[], - const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); + int run(int argc, const char* const argv[], const InitializationData& initData = InitializationData()); #ifdef _WIN32 @@ -275,12 +246,10 @@ namespace Ice * @param argc Specifies the number of arguments in argv. * @param argv The command-line arguments. * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. * @return The new communicator instance. */ virtual Ice::CommunicatorPtr - initializeCommunicator(int& argc, char* argv[], const InitializationData& initData, int version); + initializeCommunicator(int& argc, char* argv[], const InitializationData& initData); /** * Logs a system error, which includes a description of the @@ -376,7 +345,7 @@ namespace Ice #else - int runDaemon(int, char*[], const InitializationData&, int); + int runDaemon(int, char*[], const InitializationData&); bool _changeDirectory; bool _closeFiles; diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp index e2274658653..0ba5b5cb94d 100644 --- a/cpp/src/Glacier2/Glacier2Router.cpp +++ b/cpp/src/Glacier2/Glacier2Router.cpp @@ -62,7 +62,7 @@ namespace protected: bool start(int, char*[], int&) override; bool stop() override; - CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&, int) override; + CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&) override; private: void usage(const std::string&); @@ -410,11 +410,7 @@ RouterService::stop() } CommunicatorPtr -RouterService::initializeCommunicator( - int& argc, - char* argv[], - const InitializationData& initializationData, - int version) +RouterService::initializeCommunicator(int& argc, char* argv[], const InitializationData& initializationData) { InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initializationData.properties); @@ -456,7 +452,7 @@ RouterService::initializeCommunicator( // for incoming connections from clients must be disabled in // the clients. - return Service::initializeCommunicator(argc, argv, initData, version); + return Service::initializeCommunicator(argc, argv, initData); } void diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index a383fed9047..409b9f8b12f 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -196,49 +196,9 @@ Ice::ThreadHookPlugin::destroy() { } -namespace -{ - inline void checkIceVersion(int version) - { -#ifndef ICE_IGNORE_VERSION - -# if ICE_INT_VERSION % 100 > 50 - // - // Beta version: exact match required - // - if (ICE_INT_VERSION != version) - { - throw InitializationException{ - __FILE__, - __LINE__, - "version mismatch: runtime = " + to_string(ICE_INT_VERSION) + - ", generated code = " + to_string(version)}; - } -# else - - if ((ICE_INT_VERSION / 100 != version / 100) || // Major and minor version numbers must match. - (version % 100 > 50) || // Reject beta caller - // The caller's patch level cannot be greater than library's patch level. - (version % 100 > ICE_INT_VERSION % 100)) - - { - throw InitializationException{ - __FILE__, - __LINE__, - "version mismatch: runtime = " + to_string(ICE_INT_VERSION) + - ", generated code = " + to_string(version)}; - } - -# endif -#endif - } -} - Ice::CommunicatorPtr -Ice::initialize(int& argc, const char* argv[], const InitializationData& initializationData, int version) +Ice::initialize(int& argc, const char* argv[], const InitializationData& initializationData) { - checkIceVersion(version); - InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initData.properties); @@ -248,60 +208,57 @@ Ice::initialize(int& argc, const char* argv[], const InitializationData& initial } Ice::CommunicatorPtr -Ice::initialize(int& argc, const char* argv[], const string& configFile, int version) +Ice::initialize(int& argc, const char* argv[], const string& configFile) { InitializationData initData; initData.properties = createProperties(); initData.properties->load(configFile); - return initialize(argc, argv, initData, version); + return initialize(argc, argv, initData); } #ifdef _WIN32 Ice::CommunicatorPtr -Ice::initialize(int& argc, const wchar_t* argv[], const InitializationData& initializationData, int version) +Ice::initialize(int& argc, const wchar_t* argv[], const InitializationData& initializationData) { Ice::StringSeq args = argsToStringSeq(argc, argv); - CommunicatorPtr communicator = initialize(args, initializationData, version); + CommunicatorPtr communicator = initialize(args, initializationData); stringSeqToArgs(args, argc, argv); return communicator; } Ice::CommunicatorPtr -Ice::initialize(int& argc, const wchar_t* argv[], const string& configFile, int version) +Ice::initialize(int& argc, const wchar_t* argv[], const string& configFile) { InitializationData initData; initData.properties = createProperties(); initData.properties->load(configFile); - return initialize(argc, argv, initData, version); + return initialize(argc, argv, initData); } #endif Ice::CommunicatorPtr -Ice::initialize(StringSeq& args, const InitializationData& initializationData, int version) +Ice::initialize(StringSeq& args, const InitializationData& initializationData) { IceInternal::ArgVector av(args); - CommunicatorPtr communicator = initialize(av.argc, av.argv, initializationData, version); + CommunicatorPtr communicator = initialize(av.argc, av.argv, initializationData); args = argsToStringSeq(av.argc, av.argv); return communicator; } Ice::CommunicatorPtr -Ice::initialize(StringSeq& args, const string& configFile, int version) +Ice::initialize(StringSeq& args, const string& configFile) { InitializationData initData; initData.properties = createProperties(); initData.properties->load(configFile); - return initialize(args, initData, version); + return initialize(args, initData); } Ice::CommunicatorPtr -Ice::initialize(const InitializationData& initData, int version) +Ice::initialize(const InitializationData& initData) { - // // We can't simply call the other initialize() because this one does NOT read // the config file, while the other one always does. - // - checkIceVersion(version); CommunicatorPtr communicator = Communicator::create(initData); int argc = 0; @@ -311,12 +268,12 @@ Ice::initialize(const InitializationData& initData, int version) } Ice::CommunicatorPtr -Ice::initialize(const string& configFile, int version) +Ice::initialize(const string& configFile) { InitializationData initData; initData.properties = createProperties(); initData.properties->load(configFile); - return initialize(initData, version); + return initialize(initData); } LoggerPtr diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp index 5e4cf939d68..253d8916413 100644 --- a/cpp/src/Ice/Service.cpp +++ b/cpp/src/Ice/Service.cpp @@ -469,7 +469,7 @@ Ice::Service::interrupt() } int -Ice::Service::main(int argc, const char* const argv[], const InitializationData& initializationData, int version) +Ice::Service::main(int argc, const char* const argv[], const InitializationData& initializationData) { _name = ""; if (argc > 0) @@ -659,22 +659,22 @@ Ice::Service::main(int argc, const char* const argv[], const InitializationData& } } - return run(av.argc, av.argv, initData, version); + return run(av.argc, av.argv, initData); } #ifdef _WIN32 int -Ice::Service::main(int argc, const wchar_t* const argv[], const InitializationData& initializationData, int version) +Ice::Service::main(int argc, const wchar_t* const argv[], const InitializationData& initializationData) { - return main(Ice::argsToStringSeq(argc, argv), initializationData, version); + return main(Ice::argsToStringSeq(argc, argv), initializationData); } #endif int -Ice::Service::main(const StringSeq& args, const InitializationData& initData, int version) +Ice::Service::main(const StringSeq& args, const InitializationData& initData) { IceInternal::ArgVector av(args); - return main(av.argc, av.argv, initData, version); + return main(av.argc, av.argv, initData); } Ice::CommunicatorPtr @@ -703,16 +703,16 @@ Ice::Service::name() const #ifdef _WIN32 int -Ice::Service::run(int argc, const wchar_t* const argv[], const InitializationData& initData, int version) +Ice::Service::run(int argc, const wchar_t* const argv[], const InitializationData& initData) { StringSeq args = Ice::argsToStringSeq(argc, argv); IceInternal::ArgVector av(args); - return run(av.argc, av.argv, initData, version); + return run(av.argc, av.argv, initData); } #endif int -Ice::Service::run(int argc, const char* const argv[], const InitializationData& initData, int version) +Ice::Service::run(int argc, const char* const argv[], const InitializationData& initData) { IceInternal::ArgVector av(argc, argv); // copy args @@ -721,7 +721,7 @@ Ice::Service::run(int argc, const char* const argv[], const InitializationData& #ifdef _WIN32 return runService(av.argc, av.argv, initData); #else - return runDaemon(av.argc, av.argv, initData, version); + return runDaemon(av.argc, av.argv, initData); #endif } @@ -742,7 +742,7 @@ Ice::Service::run(int argc, const char* const argv[], const InitializationData& // // Initialize the communicator. // - _communicator = initializeCommunicator(av.argc, av.argv, initData, version); + _communicator = initializeCommunicator(av.argc, av.argv, initData); // // Use the configured logger. @@ -880,9 +880,9 @@ Ice::Service::stop() } Ice::CommunicatorPtr -Ice::Service::initializeCommunicator(int& argc, char* argv[], const InitializationData& initData, int version) +Ice::Service::initializeCommunicator(int& argc, char* argv[], const InitializationData& initData) { - return Ice::initialize(argc, argv, initData, version); + return Ice::initialize(argc, argv, initData); } void @@ -1238,7 +1238,7 @@ Ice::Service::serviceMain(int argc, const wchar_t* const argv[]) // try { - _communicator = initializeCommunicator(argc, args, _initData, ICE_INT_VERSION); + _communicator = initializeCommunicator(argc, args, _initData); } catch (const Ice::Exception& ex) { @@ -1435,7 +1435,7 @@ ServiceStatusManager::run() #else int -Ice::Service::runDaemon(int argc, char* argv[], const InitializationData& initData, int version) +Ice::Service::runDaemon(int argc, char* argv[], const InitializationData& initData) { assert(_service); @@ -1620,7 +1620,7 @@ Ice::Service::runDaemon(int argc, char* argv[], const InitializationData& initDa // // Initialize the communicator. // - _communicator = initializeCommunicator(argc, argv, initData, version); + _communicator = initializeCommunicator(argc, argv, initData); if (_closeFiles) { diff --git a/cpp/src/IceBridge/IceBridge.cpp b/cpp/src/IceBridge/IceBridge.cpp index 6c3c6894829..3afcfbd6a25 100644 --- a/cpp/src/IceBridge/IceBridge.cpp +++ b/cpp/src/IceBridge/IceBridge.cpp @@ -158,7 +158,7 @@ namespace protected: bool start(int, char*[], int&) final; bool stop() final; - CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&, int) final; + CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&) final; private: void usage(const std::string&); @@ -585,11 +585,7 @@ BridgeService::stop() } CommunicatorPtr -BridgeService::initializeCommunicator( - int& argc, - char* argv[], - const InitializationData& initializationData, - int version) +BridgeService::initializeCommunicator(int& argc, char* argv[], const InitializationData& initializationData) { InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initializationData.properties); @@ -602,7 +598,7 @@ BridgeService::initializeCommunicator( initData.properties->setProperty("Ice.RetryIntervals", "-1"); } - return Service::initializeCommunicator(argc, argv, initData, version); + return Service::initializeCommunicator(argc, argv, initData); } void diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 50dfe1b737c..b9abe2f5b84 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -55,7 +55,7 @@ namespace bool startImpl(int, char*[], int&); void waitForShutdown() override; bool stop() override; - CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&, int) override; + CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&) override; private: void usage(const std::string&); @@ -720,7 +720,7 @@ NodeService::stop() } CommunicatorPtr -NodeService::initializeCommunicator(int& argc, char* argv[], const InitializationData& initializationData, int version) +NodeService::initializeCommunicator(int& argc, char* argv[], const InitializationData& initializationData) { InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initData.properties); @@ -772,7 +772,7 @@ NodeService::initializeCommunicator(int& argc, char* argv[], const Initializatio // setupThreadPool(initData.properties, "Ice.ThreadPool.Client", 1, 100); - return Service::initializeCommunicator(argc, argv, initData, version); + return Service::initializeCommunicator(argc, argv, initData); } void diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp index 172e734aaca..984d467ab7a 100644 --- a/cpp/src/IceGrid/IceGridRegistry.cpp +++ b/cpp/src/IceGrid/IceGridRegistry.cpp @@ -25,7 +25,7 @@ namespace IceGrid bool start(int, char*[], int&) override; void waitForShutdown() override; bool stop() override; - CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&, int) override; + CommunicatorPtr initializeCommunicator(int&, char*[], const InitializationData&) override; private: void usage(const std::string&); @@ -138,11 +138,7 @@ RegistryService::stop() } CommunicatorPtr -RegistryService::initializeCommunicator( - int& argc, - char* argv[], - const InitializationData& initializationData, - int version) +RegistryService::initializeCommunicator(int& argc, char* argv[], const InitializationData& initializationData) { InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initData.properties); @@ -202,7 +198,7 @@ RegistryService::initializeCommunicator( // setupThreadPool(initData.properties, "Ice.ThreadPool.Client", 1, 100); - return Service::initializeCommunicator(argc, argv, initData, version); + return Service::initializeCommunicator(argc, argv, initData); } void