Major cleanup in PortableServer library

1 files changed, 8 insertions, 8 deletions

diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
index b28b53ea4a5..0f1e51fb0eb 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
@@ -9,49 +9,49 @@ namespace TAO
     ThreadStrategy*
     Active_Policy_Strategies::thread_strategy () const
     {
-      return this->thread_strategy_;
+      return this->thread_strategy_.get ();
     }
 
     ACE_INLINE
     RequestProcessingStrategy*
     Active_Policy_Strategies::request_processing_strategy () const
     {
-      return this->request_processing_strategy_;
+      return this->request_processing_strategy_.get ();
     }
 
     ACE_INLINE
     IdAssignmentStrategy *
     Active_Policy_Strategies::id_assignment_strategy () const
     {
-      return this->id_assignment_strategy_;
+      return this->id_assignment_strategy_. get ();
     }
 
     ACE_INLINE
     IdUniquenessStrategy *
     Active_Policy_Strategies::id_uniqueness_strategy () const
     {
-      return this->id_uniqueness_strategy_;
+      return this->id_uniqueness_strategy_.get ();
     }
 
     ACE_INLINE
     LifespanStrategy*
     Active_Policy_Strategies::lifespan_strategy () const
     {
-      return this->lifespan_strategy_;
+      return this->lifespan_strategy_. get();
     }
 
     ACE_INLINE
     ImplicitActivationStrategy*
     Active_Policy_Strategies::implicit_activation_strategy () const
     {
-      return this->implicit_activation_strategy_;
+      return this->implicit_activation_strategy_.get ();
     }
 
     ACE_INLINE
     ServantRetentionStrategy*
     Active_Policy_Strategies::servant_retention_strategy () const
     {
-      return this->servant_retention_strategy_;
+      return this->servant_retention_strategy_.get ();
     }
 
     ACE_INLINE
@@ -76,7 +76,7 @@ namespace TAO
     Active_Policy_Strategies_Cleanup_Guard::_retn ()
     {
       Active_Policy_Strategies *temp = this->ptr_;
-      this->ptr_ = 0;
+      this->ptr_ = nullptr;
       return temp;
     }
   }