diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-05-15 13:03:34 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-05-15 13:03:34 +0200 |
| commit | afa546317cb4ad800e4337edd4ea98f91135e7c9 (patch) | |
| tree | 93d1ea77c4b3c8762b78b7cd030e561831c2084e /TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp | |
| parent | e915b48fcd7eee34bf661673b532bfa0b6e9cccb (diff) | |
| download | ATCD-afa546317cb4ad800e4337edd4ea98f91135e7c9.tar.gz | |
Use std::unique_ptr when using C++11
* TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
* TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp:
* TAO/tao/AnyTypeCode/Any_Impl_T.cpp:
* TAO/tao/Connector_Registry.cpp:
* TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
* TAO/tao/Load_Protocol_Factory_T.h:
* TAO/tao/ORB_Core.cpp:
* TAO/tao/RTCORBA/Thread_Pool.cpp:
* TAO/tao/Stub.cpp:
* TAO/tao/Synch_Invocation.cpp:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index 8654e2210ae..d35ba8282e2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -484,7 +484,11 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, TAO::Storable_Factory* pf = 0; ACE_CString directory (ACE_TEXT_ALWAYS_CHAR (persistence_location)); ACE_NEW_RETURN (pf, TAO::Storable_FlatFileFactory (directory), -1); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO::Storable_Factory> persFactory(pf); +#else auto_ptr<TAO::Storable_Factory> persFactory(pf); +#endif /* ACE_HAS_CPP11 */ // Use an auto_ptr to ensure that we clean up the factory in the case // of a failure in creating and registering the Activator. |