summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-08-14 16:38:21 -0400
committerBernard Normier <bernard@zeroc.com>2014-08-14 16:38:21 -0400
commit18748d529095d3ab86e3dc42abfd2b5f4946f9a7 (patch)
tree1f343c0790d98e7fbcff50ad94ea5c1e272b2d4f /cpp/src/Ice/Instance.h
parentFixed ice_invocationTimout usage in IceDiscovery hello demos (diff)
downloadice-18748d529095d3ab86e3dc42abfd2b5f4946f9a7.tar.bz2
ice-18748d529095d3ab86e3dc42abfd2b5f4946f9a7.tar.xz
ice-18748d529095d3ab86e3dc42abfd2b5f4946f9a7.zip
Initial merge for ICE-2400:
- added new Logger admin facet (C++ only) - this Logger facet allows remote application to retrieve the Ice log file, including recently logged events, with optional filters - this logger facet also allows remote applications to attach RemoteLogger objects to get new logs as they are generated - added new "show log" feature to icegridadmin, to retrieve Ice log file of Ice server (not yet implemented for IceGrid registry and node)
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 9373b960fda..e9806b307a6 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -120,7 +120,7 @@ private:
Instance(const Ice::CommunicatorPtr&, const Ice::InitializationData&);
virtual ~Instance();
- void finishSetup(int&, char*[]);
+ void finishSetup(int&, char*[], const Ice::CommunicatorPtr&);
void destroy();
friend class Ice::CommunicatorI;