summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Initialize.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2017-03-13 16:29:33 -0400
committerBernard Normier <bernard@zeroc.com>2017-03-13 16:29:33 -0400
commit0677d4051840412c5cd8a3b7b8e5ad86a6608f59 (patch)
treec620bc26e263120e823607b772776d3fab13f78a /cpp/src/Ice/Initialize.cpp
parentFixed ICE-7665 - fixed test/Ice/imple GNU make warning (diff)
downloadice-0677d4051840412c5cd8a3b7b8e5ad86a6608f59.tar.bz2
ice-0677d4051840412c5cd8a3b7b8e5ad86a6608f59.tar.xz
ice-0677d4051840412c5cd8a3b7b8e5ad86a6608f59.zip
Added new ctors to Ice::CommunicatorHolder
Diffstat (limited to 'cpp/src/Ice/Initialize.cpp')
-rw-r--r--cpp/src/Ice/Initialize.cpp22
1 files changed, 22 insertions, 0 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index c09e34033d0..8d573d680f0 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -365,6 +365,28 @@ Ice::CommunicatorHolder::CommunicatorHolder(shared_ptr<Communicator> communicato
#else
+Ice::CommunicatorHolder::CommunicatorHolder(int& argc, char* argv[], const InitializationData& initData, Int version) :
+ _communicator(initialize(argc, argv, initData, version))
+{
+}
+
+#ifdef _WIN32
+Ice::CommunicatorHolder::CommunicatorHolder(int& argc, wchar_t* argv[], const InitializationData& initData, Int version) :
+ _communicator(initialize(argc, argv, initData, version))
+{
+}
+#endif
+
+Ice::CommunicatorHolder::CommunicatorHolder(StringSeq& args, const InitializationData& initData, Int version) :
+ _communicator(initialize(args, initData, version))
+{
+}
+
+Ice::CommunicatorHolder::CommunicatorHolder(const InitializationData& initData, Int version) :
+ _communicator(initialize(initData, version))
+{
+}
+
Ice::CommunicatorHolder::CommunicatorHolder(const CommunicatorPtr& communicator) :
_communicator(communicator)
{