diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-05-15 16:24:30 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-05-15 16:24:30 +0200 |
| commit | 330d868ab419f28e24dfe1b9d29500eafac66b7e (patch) | |
| tree | f71580fd55c7e6a43e89d0ae168414d1d02ccbaf /TAO/tao/PortableServer/ServantRetentionStrategyRetain.h | |
| parent | c4a7434d85ec752a5939bfafc35384534fc4705d (diff) | |
| download | ATCD-330d868ab419f28e24dfe1b9d29500eafac66b7e.tar.gz | |
Use std::unique_ptr when usign C++11
* TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp:
* TAO/tao/PortableServer/Object_Adapter.cpp:
* TAO/tao/PortableServer/Root_POA.cpp:
* TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:
Diffstat (limited to 'TAO/tao/PortableServer/ServantRetentionStrategyRetain.h')
| -rw-r--r-- | TAO/tao/PortableServer/ServantRetentionStrategyRetain.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 726625941f8..500629cf1c0 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -139,7 +139,11 @@ namespace TAO TAO_Active_Object_Map * get_active_object_map() const; private: +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Active_Object_Map> active_object_map_; +#else auto_ptr<TAO_Active_Object_Map> active_object_map_; +#endif /* ACE_HAS_CPP11 */ CORBA::ULong waiting_servant_deactivation_; }; } |