summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-09-08 12:03:16 -0400
committerBernard Normier <bernard@zeroc.com>2014-09-08 12:03:16 -0400
commita0f6b6fc1a619c40979f5ba00d71dc661cfc6499 (patch)
tree81b40da86417ed18a186d595c119bb7823b17fcf /cpp/src/Ice/Instance.h
parentICE-5658 - NPM support for IceJS distribution (diff)
downloadice-a0f6b6fc1a619c40979f5ba00d71dc661cfc6499.tar.bz2
ice-a0f6b6fc1a619c40979f5ba00d71dc661cfc6499.tar.xz
ice-a0f6b6fc1a619c40979f5ba00d71dc661cfc6499.zip
Fixed ICE-5667: Added Communicator::createAdmin in C++, Java, C# and Python
Diffstat (limited to 'cpp/src/Ice/Instance.h')
-rw-r--r--cpp/src/Ice/Instance.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index e9806b307a6..19bfda51f89 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -89,6 +89,7 @@ public:
Ice::Identity stringToIdentity(const std::string&) const;
std::string identityToString(const Ice::Identity&) const;
+ Ice::ObjectPrx createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
Ice::ObjectPrx getAdmin();
void addAdminFacet(const Ice::ObjectPtr&, const std::string&);
Ice::ObjectPtr removeAdminFacet(const std::string&);
@@ -128,6 +129,10 @@ private:
void updateThreadObservers();
friend class ObserverUpdaterI;
+ void addAllAdminFacets();
+ void setServerProcessProxy(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
+ bool getAdminEnabledDefaultValue() const;
+
enum State
{
StateActive,
@@ -163,6 +168,7 @@ private:
const Ice::ImplicitContextIPtr _implicitContext;
IceUtil::StringConverterPtr _stringConverter;
IceUtil::WstringConverterPtr _wstringConverter;
+ bool _adminEnabled;
Ice::ObjectAdapterPtr _adminAdapter;
Ice::FacetMap _adminFacets;
Ice::Identity _adminIdentity;