summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2017-03-28 10:06:55 -0400
committerBernard Normier <bernard@zeroc.com>2017-03-28 10:06:55 -0400
commitdb5588f918abf3e2c0fa1d52b84077af73921706 (patch)
treeb5c59119c69631bf20d207823b9db0d536020db7 /cpp/src/Ice/Instance.cpp
parentFixed ICE-7673 - use continations and await in Ice/dispatcher test (diff)
downloadice-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/Ice/Instance.cpp')
-rw-r--r--cpp/src/Ice/Instance.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index cba9085ba4f..936bf3cca2f 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -1336,7 +1336,7 @@ IceInternal::Instance::~Instance()
}
void
-IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+IceInternal::Instance::finishSetup(int& argc, const char* argv[], const Ice::CommunicatorPtr& communicator)
{
//
// Load plug-ins.