diff options
Diffstat (limited to 'TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp')
-rw-r--r-- | TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index e4e39fbe4bd..7fd93860d12 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -24,12 +24,6 @@ namespace TAO { namespace Portable_Server { - ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain () : - poa_ (0), - sys_id_count_ (0) - { - } - void ServantRetentionStrategyNonRetain::strategy_init (TAO_Root_POA *poa) { @@ -39,7 +33,7 @@ namespace TAO void ServantRetentionStrategyNonRetain::strategy_cleanup () { - poa_ = 0; + poa_ = nullptr; } void @@ -87,12 +81,12 @@ namespace TAO throw PortableServer::POA::WrongPolicy (); } - TAO_SERVANT_LOCATION + TAO_Servant_Location ServantRetentionStrategyNonRetain::servant_present ( const PortableServer::ObjectId &/*system_id*/, PortableServer::Servant &/*servant*/) { - return TAO_SERVANT_NOT_FOUND; + return TAO_Servant_Location::Not_Found; } PortableServer::Servant |