diff --git a/cpp/include/DataStorm/Node.h b/cpp/include/DataStorm/Node.h index 9d1a6983971..21760e5bf14 100644 --- a/cpp/include/DataStorm/Node.h +++ b/cpp/include/DataStorm/Node.h @@ -46,80 +46,6 @@ namespace DataStorm */ Node(Ice::CommunicatorPtr communicator); - /** - * Construct a DataStorm node. - * - * A node is the main DataStorm object. It is required to construct topics. This constructor parses the - * command line arguments into Ice properties and initialize a new Node. The constructor initializes the - * Ice communicator using the given Ice arguments. If the communicator creation fails, an Ice exception is - * raised. - * - * @param argc The number of command line arguments in the argv array. - * @param argv The command line arguments. - * @param iceArgs Additional arguments which are passed to the Ice::initialize function in addition to the - * argc and argv arguments. - */ - template Node(int& argc, const char* argv[], T&&... iceArgs) : _ownsCommunicator(true) - { - init(argc, argv, std::forward(iceArgs)...); - } - - /** - * Construct a DataStorm node. - * - * A node is the main DataStorm object. It is required to construct topics. This constructor parses the - * command line arguments into Ice properties and initialize a new Node. The constructor initializes the - * Ice communicator using the given Ice arguments. If the communicator creation fails, an Ice exception is - * raised. - * - * @param argc The number of command line arguments in the argv array. - * @param argv The command line arguments. - * @param iceArgs Additional arguments which are passed to the Ice::initialize function in addition to the - * argc and argv arguments. - */ - template Node(int& argc, char* argv[], T&&... iceArgs) : _ownsCommunicator(true) - { - init(argc, argv, std::forward(iceArgs)...); - } - -#ifdef _WIN32 - /** - * Construct a DataStorm node. - * - * A node is the main DataStorm object. It is required to construct topics. This constructor parses the - * command line arguments into Ice properties and initialize a new Node. The constructor initializes the - * Ice communicator using the given Ice arguments. If the communicator creation fails, an Ice exception is - * raised. - * - * @param argc The number of command line arguments in the argv array. - * @param argv The command line arguments. - * @param iceArgs Additional arguments which are passed to the Ice::initialize function in addition to the - * argc and argv arguments. - */ - template Node(int& argc, const wchar_t* argv[], T&&... iceArgs) : _ownsCommunicator(true) - { - init(argc, argv, std::forward(iceArgs)...); - } - - /** - * Construct a DataStorm node. - * - * A node is the main DataStorm object. It is required to construct topics. This constructor parses the - * command line arguments into Ice properties and initialize a new Node. The constructor initializes the - * Ice communicator using the given Ice arguments. If the communicator creation fails, an Ice exception is - * raised. - * - * @param argc The number of command line arguments in the argv array. - * @param argv The command line arguments. - * @param iceArgs Additional arguments which are passed to the Ice::initialize function in addition to the - * argc and argv arguments. - */ - template Node(int& argc, wchar_t* argv[], T&&... iceArgs) : _ownsCommunicator(true) - { - init(argc, argv, std::forward(iceArgs)...); - } -#endif - /** * Construct a DataStorm node. * @@ -187,15 +113,6 @@ namespace DataStorm Ice::ConnectionPtr getSessionConnection(const std::string& ident) const noexcept; private: - template void init(int& argc, V argv, T&&... iceArgs) - { - auto communicator = Ice::initialize(argc, argv, std::forward(iceArgs)...); - auto args = Ice::argsToStringSeq(argc, argv); - args = communicator->getProperties()->parseCommandLineOptions("DataStorm", args); - Ice::stringSeqToArgs(args, argc, argv); - init(communicator); - } - void init(const Ice::CommunicatorPtr&); std::shared_ptr _instance; diff --git a/cpp/src/IceBridge/IceBridge.cpp b/cpp/src/IceBridge/IceBridge.cpp index 514a41cca35..6c3c6894829 100644 --- a/cpp/src/IceBridge/IceBridge.cpp +++ b/cpp/src/IceBridge/IceBridge.cpp @@ -594,10 +594,6 @@ BridgeService::initializeCommunicator( InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initializationData.properties); - StringSeq args = argsToStringSeq(argc, argv); - args = initData.properties->parseCommandLineOptions("IceBridge", args); - stringSeqToArgs(args, argc, argv); - // // Disable automatic retry by default. //