diff options
author | Benoit Foucher <benoit@zeroc.com> | 2006-11-08 13:11:53 +0000 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2006-11-08 13:11:53 +0000 |
commit | 9ee6c6e7174ba8246559a4b73799c83c17f3d309 (patch) | |
tree | 3a29c01afe1e0555215d9fdecd14a6b0af98a0a7 /cpp/src/IceGrid/ServerAdapterI.h | |
parent | adding a flag to skip precondition checks. (diff) | |
download | ice-9ee6c6e7174ba8246559a4b73799c83c17f3d309.tar.bz2 ice-9ee6c6e7174ba8246559a4b73799c83c17f3d309.tar.xz ice-9ee6c6e7174ba8246559a4b73799c83c17f3d309.zip |
Added server-lifetime attribute and removed wait-for-activation.
Diffstat (limited to 'cpp/src/IceGrid/ServerAdapterI.h')
-rw-r--r-- | cpp/src/IceGrid/ServerAdapterI.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/ServerAdapterI.h b/cpp/src/IceGrid/ServerAdapterI.h index 41a2c5ee5fe..7f02aedd3b4 100644 --- a/cpp/src/IceGrid/ServerAdapterI.h +++ b/cpp/src/IceGrid/ServerAdapterI.h @@ -25,7 +25,7 @@ class ServerAdapterI : public Adapter, public IceUtil::Mutex { public: - ServerAdapterI(const NodeIPtr&, ServerI*, const std::string&, const AdapterPrx&, const std::string&, Ice::Int); + ServerAdapterI(const NodeIPtr&, ServerI*, const std::string&, const AdapterPrx&, const std::string&); virtual ~ServerAdapterI(); virtual void activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Current&); @@ -33,7 +33,7 @@ public: virtual void setDirectProxy(const ::Ice::ObjectPrx&, const ::Ice::Current& = Ice::Current()); void destroy(); void clear(); - void activationFailed(bool); + void activationFailed(const std::string&); AdapterPrx getProxy() const; @@ -45,7 +45,6 @@ private: const std::string _id; const std::string _replicaId; ServerI* _server; - const IceUtil::Time _waitTime; Ice::ObjectPrx _proxy; std::vector<AMD_Adapter_activatePtr> _activateCB; |