From 03ead678354f6e07c988a46e158b997896f8aeca Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 15 May 2018 19:09:14 +0200 Subject: Make use of std::unique_ptr * TAO/tao/PortableServer/Object_Adapter.cpp: --- TAO/tao/PortableServer/Object_Adapter.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 2b5e7a3e9cb..00819b064ec 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -197,7 +197,11 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ break; } // Give ownership to the auto pointer. +#if defined (ACE_HAS_CPP11) + std::unique_ptr new_persistent_poa_name_map (ppnm); +#else auto_ptr new_persistent_poa_name_map (ppnm); +#endif /* ACE_HAS_CPP11 */ transient_poa_map *tpm = 0; switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_) @@ -233,12 +237,9 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ auto_ptr new_transient_poa_map (tpm); #endif /* ACE_HAS_CPP11 */ - this->hint_strategy_ = - new_hint_strategy.release (); - this->persistent_poa_name_map_ = - new_persistent_poa_name_map.release (); - this->transient_poa_map_ = - new_transient_poa_map.release (); + this->hint_strategy_ = new_hint_strategy.release (); + this->persistent_poa_name_map_ = new_persistent_poa_name_map.release (); + this->transient_poa_map_ = new_transient_poa_map.release (); } void -- cgit v1.2.1