diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-02-14 09:05:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-14 09:05:54 +0100 |
commit | 54406e2ff1e39a3245d04253648153d5f4751938 (patch) | |
tree | 2c92b2450e6872403cdd50b43ff764da236ffb12 /TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp | |
parent | 69fbec6c475060cf01a710a3d7ed6e756538858c (diff) | |
parent | d19030946af88f57a4b2b29af9228cbbf0386a71 (diff) | |
download | ATCD-54406e2ff1e39a3245d04253648153d5f4751938.tar.gz |
Merge pull request #2050 from jwillemsen/jwi-portableserverstrategysimplify
Major cleanup in PortableServer library
Diffstat (limited to 'TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp')
-rw-r--r-- | TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index efcd7935078..292e13dfcd2 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -26,13 +26,6 @@ namespace TAO { namespace Portable_Server { - ServantRetentionStrategyRetain::ServantRetentionStrategyRetain () : - ServantRetentionStrategyNonRetain (), - active_object_map_ (), - waiting_servant_deactivation_ (0) - { - } - void ServantRetentionStrategyRetain::strategy_init (TAO_Root_POA *poa) { @@ -234,7 +227,7 @@ namespace TAO } } - TAO_SERVANT_LOCATION + TAO_Servant_Location ServantRetentionStrategyRetain::servant_present ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant) @@ -256,11 +249,11 @@ namespace TAO if (result == 0) { // Success - return TAO_SERVANT_FOUND; + return TAO_Servant_Location::Found; } else { - return TAO_SERVANT_NOT_FOUND; + return TAO_Servant_Location::Not_Found; } } @@ -961,13 +954,6 @@ namespace TAO return this->active_object_map_->remaining_activations (servant); } - - ::PortableServer::ServantRetentionPolicyValue - ServantRetentionStrategyRetain::type() const - { - return ::PortableServer::RETAIN; - } - TAO_Active_Object_Map * ServantRetentionStrategyRetain::get_active_object_map() const { |