diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-05-15 13:12:51 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-05-15 13:12:51 +0200 |
| commit | b361514d8bea5de5bd984bb10205ecf0843c04c6 (patch) | |
| tree | d7e8baffb17051e8dbda1c742e27f4bc7423a4c8 | |
| parent | afa546317cb4ad800e4337edd4ea98f91135e7c9 (diff) | |
| download | ATCD-b361514d8bea5de5bd984bb10205ecf0843c04c6.tar.gz | |
Make use of std::unique_ptr when we have C++11
* TAO/tao/PortableServer/Active_Object_Map.h:
| -rw-r--r-- | TAO/tao/PortableServer/Active_Object_Map.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index 58c21c9cd83..a37e2fcaee5 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -237,22 +237,46 @@ public: #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ /// Id map. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<user_id_map> user_id_map_; +#else auto_ptr<user_id_map> user_id_map_; +#endif /* ACE_HAS_CPP11 */ /// Servant map. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<servant_map> servant_map_; +#else auto_ptr<servant_map> servant_map_; +#endif /* ACE_HAS_CPP11 */ /// Id uniqueness strategy. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Id_Uniqueness_Strategy> id_uniqueness_strategy_; +#else auto_ptr<TAO_Id_Uniqueness_Strategy> id_uniqueness_strategy_; +#endif /* ACE_HAS_CPP11 */ /// Lifespan strategy. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Lifespan_Strategy> lifespan_strategy_; +#else auto_ptr<TAO_Lifespan_Strategy> lifespan_strategy_; +#endif /* ACE_HAS_CPP11 */ /// Id assignment strategy. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Id_Assignment_Strategy> id_assignment_strategy_; +#else auto_ptr<TAO_Id_Assignment_Strategy> id_assignment_strategy_; +#endif /* ACE_HAS_CPP11 */ /// Id hint strategy. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Id_Hint_Strategy> id_hint_strategy_; +#else auto_ptr<TAO_Id_Hint_Strategy> id_hint_strategy_; +#endif /* ACE_HAS_CPP11 */ /// Flag to see if we are using active maps in this active object /// map. |