summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.h
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.h
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.h')
-rw-r--r--cpp/src/Ice/Instance.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index 9bcc78e0990..bf6c1d9d910 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -152,7 +152,7 @@ private:
Instance(const Ice::CommunicatorPtr&, const Ice::InitializationData&);
virtual ~Instance();
- void finishSetup(int&, char*[], const Ice::CommunicatorPtr&);
+ void finishSetup(int&, const char*[], const Ice::CommunicatorPtr&);
void destroy();
friend class Ice::CommunicatorI;