diff options
Diffstat (limited to 'TAO/tao/PortableServer/Object_Adapter.cpp')
-rw-r--r-- | TAO/tao/PortableServer/Object_Adapter.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index b8cd2a2d059..bc65cf1fbc3 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -166,11 +166,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ No_Hint_Strategy); // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<Hint_Strategy> new_hint_strategy (hint_strategy); -#else - auto_ptr<Hint_Strategy> new_hint_strategy (hint_strategy); -#endif /* ACE_HAS_CPP11 */ new_hint_strategy->object_adapter (this); @@ -197,11 +193,7 @@ 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<persistent_poa_name_map> new_persistent_poa_name_map (ppnm); -#else - auto_ptr<persistent_poa_name_map> 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_) @@ -231,11 +223,7 @@ 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<transient_poa_map> new_transient_poa_map (tpm); -#else - auto_ptr<transient_poa_map> 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 (); |