Use std::unique_ptr

26 files changed, 42 insertions, 42 deletions

diff --git a/ACE/tests/Bug_1890_Regression_Test.cpp b/ACE/tests/Bug_1890_Regression_Test.cpp
index 492b246937d..09cacb47b1f 100644
--- a/ACE/tests/Bug_1890_Regression_Test.cpp
+++ b/ACE/tests/Bug_1890_Regression_Test.cpp
@@ -101,7 +101,7 @@ run_main (int, ACE_TCHAR *[])
   // regardless of platform.
   ACE_Select_Reactor *impl_ptr = 0;
   ACE_NEW_RETURN (impl_ptr, ACE_Select_Reactor, -1);
-  unique_ptr<ACE_Select_Reactor> auto_impl (impl_ptr);
+  std::unique_ptr<ACE_Select_Reactor> auto_impl (impl_ptr);
 
   ACE_Reactor reactor (impl_ptr);
 
diff --git a/ACE/tests/Future_Set_Test.cpp b/ACE/tests/Future_Set_Test.cpp
index bd5706e3da7..2549e25cd1c 100644
--- a/ACE/tests/Future_Set_Test.cpp
+++ b/ACE/tests/Future_Set_Test.cpp
@@ -283,7 +283,7 @@ Prime_Scheduler::svc (void)
     {
       // Dequeue the next method request (we use an auto pointer in
       // case an exception is thrown in the <call>).
-      unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
+      std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) calling method request\n")));
diff --git a/ACE/tests/Future_Test.cpp b/ACE/tests/Future_Test.cpp
index 55f170d0e37..f930ee3dad1 100644
--- a/ACE/tests/Future_Test.cpp
+++ b/ACE/tests/Future_Test.cpp
@@ -289,7 +289,7 @@ Prime_Scheduler::svc (void)
     {
       // Dequeue the next method request (we use an auto pointer in
       // case an exception is thrown in the <call>).
-      unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
+      std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) calling method request\n")));
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index 450f881a727..0b0aed0285a 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -87,7 +87,7 @@ static const void *CHILD_BASE_ADDR =
 static MALLOC *
 myallocator (const void *base_addr = 0)
 {
-  static unique_ptr<MALLOC> static_allocator;
+  static std::unique_ptr<MALLOC> static_allocator;
 
   if (static_allocator.get () == 0)
     {
diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp
index efedaba8c77..bb2ddd525fc 100644
--- a/ACE/tests/Network_Adapters_Test.cpp
+++ b/ACE/tests/Network_Adapters_Test.cpp
@@ -1046,7 +1046,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   // to do it right in at least one test.  Notice the lack of
   // ACE_NEW_RETURN, that monstrosity has no business in proper C++
   // code ...
-  unique_ptr<ACE_Timer_Heap_Variable_Time_Source> tq(
+  std::unique_ptr<ACE_Timer_Heap_Variable_Time_Source> tq(
       new ACE_Timer_Heap_Variable_Time_Source);
   // ... notice how the policy is in the derived timer queue type.
   // The abstract timer queue does not have a time policy ...
diff --git a/ACE/tests/Notify_Performance_Test.cpp b/ACE/tests/Notify_Performance_Test.cpp
index 5d30ca5f166..676fa8f3055 100644
--- a/ACE/tests/Notify_Performance_Test.cpp
+++ b/ACE/tests/Notify_Performance_Test.cpp
@@ -193,14 +193,14 @@ run_main (int argc, ACE_TCHAR *argv[])
   create_reactor ();
 
   // Manage memory automagically.
-  unique_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ());
-  unique_ptr<ACE_Reactor_Impl> impl;
+  std::unique_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ());
+  std::unique_ptr<ACE_Reactor_Impl> impl;
 
   // If we are using other that the default implementation, we must
   // clean up.
   if (opt_select_reactor || opt_wfmo_reactor || opt_dev_poll_reactor)
     {
-      unique_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ());
+      std::unique_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ());
       impl = std::move(auto_impl);
     }
 
diff --git a/ACE/tests/Priority_Reactor_Test.cpp b/ACE/tests/Priority_Reactor_Test.cpp
index 493be83e9ff..36915b6c9bc 100644
--- a/ACE/tests/Priority_Reactor_Test.cpp
+++ b/ACE/tests/Priority_Reactor_Test.cpp
@@ -273,18 +273,18 @@ run_main (int argc, ACE_TCHAR *argv[])
   // Note:  If opt_priority_reactor is false, the default ACE_Reactor is used
   // and we don't need to set one up.
   ACE_Reactor *orig_reactor = 0;
-  unique_ptr<ACE_Reactor> reactor;
+  std::unique_ptr<ACE_Reactor> reactor;
 
   if (opt_priority_reactor)
     {
       ACE_Select_Reactor *impl_ptr;
       ACE_NEW_RETURN (impl_ptr, ACE_Priority_Reactor, -1);
-      unique_ptr<ACE_Select_Reactor> auto_impl (impl_ptr);
+      std::unique_ptr<ACE_Select_Reactor> auto_impl (impl_ptr);
 
       ACE_Reactor *reactor_ptr;
       ACE_NEW_RETURN (reactor_ptr, ACE_Reactor (impl_ptr, 1), -1);
       auto_impl.release ();   // ACE_Reactor dtor will take it from here
-      unique_ptr<ACE_Reactor> auto_reactor (reactor_ptr);
+      std::unique_ptr<ACE_Reactor> auto_reactor (reactor_ptr);
       reactor = std::move(auto_reactor);
       orig_reactor = ACE_Reactor::instance (reactor_ptr);
     }
diff --git a/ACE/tests/Proactor_Timer_Test.cpp b/ACE/tests/Proactor_Timer_Test.cpp
index a1504f02f5c..0897cf6849b 100644
--- a/ACE/tests/Proactor_Timer_Test.cpp
+++ b/ACE/tests/Proactor_Timer_Test.cpp
@@ -310,7 +310,7 @@ run_main (int argc, ACE_TCHAR *[])
       // code ...
       typedef ACE_Timer_Heap_T<ACE_Handler*,ACE_Proactor_Handle_Timeout_Upcall,ACE_SYNCH_RECURSIVE_MUTEX,ACE_FPointer_Time_Policy> Timer_Queue;
 
-      unique_ptr<Timer_Queue> tq(new Timer_Queue);
+      std::unique_ptr<Timer_Queue> tq(new Timer_Queue);
       // ... notice how the policy is in the derived timer queue type.
       // The abstract timer queue does not have a time policy ...
       tq->set_time_policy(&ACE_High_Res_Timer::gettimeofday_hr);
diff --git a/ACE/tests/Reactor_Notify_Test.cpp b/ACE/tests/Reactor_Notify_Test.cpp
index 41ff9e0b573..360f956f423 100644
--- a/ACE/tests/Reactor_Notify_Test.cpp
+++ b/ACE/tests/Reactor_Notify_Test.cpp
@@ -364,7 +364,7 @@ run_test (int disable_notify_pipe,
                   -1);
 
   // Make sure this stuff gets cleaned up when this function exits.
-  unique_ptr<ACE_Reactor> r (reactor);
+  std::unique_ptr<ACE_Reactor> r (reactor);
 
   // Set the Singleton Reactor.
   ACE_Reactor *orig_reactor = ACE_Reactor::instance (reactor);
@@ -465,7 +465,7 @@ run_notify_purge_test (void)
     Purged_Notify *n2;
 
     ACE_NEW_RETURN (n2, Purged_Notify, -1);
-    unique_ptr<Purged_Notify> ap (n2);
+    std::unique_ptr<Purged_Notify> ap (n2);
 
     // First test:
     // Notify EXCEPT, and purge ALL
diff --git a/ACE/tests/Reactor_Performance_Test.cpp b/ACE/tests/Reactor_Performance_Test.cpp
index 6d72c2fad47..e388cf2ebf0 100644
--- a/ACE/tests/Reactor_Performance_Test.cpp
+++ b/ACE/tests/Reactor_Performance_Test.cpp
@@ -335,14 +335,14 @@ run_main (int argc, ACE_TCHAR *argv[])
   create_reactor ();
 
   // Manage memory automagically.
-  unique_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ());
-  unique_ptr<ACE_Reactor_Impl> impl;
+  std::unique_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ());
+  std::unique_ptr<ACE_Reactor_Impl> impl;
 
   // If we are using other that the default implementation, we must
   // clean up.
   if (opt_select_reactor || opt_wfmo_reactor)
     {
-      unique_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ());
+      std::unique_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ());
       impl = std::move(auto_impl);
     }
 
diff --git a/ACE/tests/Reactor_Remove_Resume_Test.cpp b/ACE/tests/Reactor_Remove_Resume_Test.cpp
index b36ebe18cd2..67571d56363 100644
--- a/ACE/tests/Reactor_Remove_Resume_Test.cpp
+++ b/ACE/tests/Reactor_Remove_Resume_Test.cpp
@@ -362,7 +362,7 @@ handle_events (ACE_Reactor & reactor,
 
 // ------------------------------------------------------------
 
-typedef unique_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (void);
+typedef std::unique_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (void);
 
 unique_ptr<ACE_Reactor_Impl>
 tp_reactor_factory (void)
@@ -370,7 +370,7 @@ tp_reactor_factory (void)
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Creating ACE_TP_Reactor.\n")));
 
-  return unique_ptr<ACE_Reactor_Impl> (new ACE_TP_Reactor);
+  return std::unique_ptr<ACE_Reactor_Impl> (new ACE_TP_Reactor);
 }
 
 // ------------------------------------------------------------
@@ -412,7 +412,7 @@ struct Run_Test : public std::unary_function<reactor_factory_type, void>
                         ACE_TEXT ("** Running removal test **\n")));
           }
 
-        unique_ptr<ACE_Reactor_Impl> the_factory (factory ());
+        std::unique_ptr<ACE_Reactor_Impl> the_factory (factory ());
         ACE_Reactor reactor (the_factory.get ());
 
         // In this test, it's only okay to close the Bogus_Handler
diff --git a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp
index 0295bdd08a8..29b01c1d57c 100644
--- a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp
+++ b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp
@@ -366,7 +366,7 @@ handle_events (ACE_Reactor & reactor,
 
 // ------------------------------------------------------------
 
-typedef unique_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (void);
+typedef std::unique_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (void);
 
 unique_ptr<ACE_Reactor_Impl>
 dev_poll_reactor_factory (void)
@@ -374,7 +374,7 @@ dev_poll_reactor_factory (void)
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Creating ACE_Dev_Poll_Reactor.\n")));
 
-  return unique_ptr<ACE_Reactor_Impl> (new ACE_Dev_Poll_Reactor);
+  return std::unique_ptr<ACE_Reactor_Impl> (new ACE_Dev_Poll_Reactor);
 }
 
 // ------------------------------------------------------------
@@ -416,7 +416,7 @@ struct Run_Test : public std::unary_function<reactor_factory_type, void>
                         ACE_TEXT ("** Running removal test **\n")));
           }
 
-        unique_ptr<ACE_Reactor_Impl> the_factory (factory ());
+        std::unique_ptr<ACE_Reactor_Impl> the_factory (factory ());
         ACE_Reactor reactor (the_factory.get ());
 
         // In this test, it's only okay to close the Bogus_Handler
diff --git a/ACE/tests/Reactor_Timer_Test.cpp b/ACE/tests/Reactor_Timer_Test.cpp
index 28db2c61a08..8e51fbf4196 100644
--- a/ACE/tests/Reactor_Timer_Test.cpp
+++ b/ACE/tests/Reactor_Timer_Test.cpp
@@ -255,7 +255,7 @@ run_main (int argc, ACE_TCHAR *[])
       // to do it right in at least one test.  Notice the lack of
       // ACE_NEW_RETURN, that monstrosity has no business in proper C++
       // code ...
-      unique_ptr<ACE_Timer_Heap_Variable_Time_Source> tq(
+      std::unique_ptr<ACE_Timer_Heap_Variable_Time_Source> tq(
           new ACE_Timer_Heap_Variable_Time_Source);
       // ... notice how the policy is in the derived timer queue type.
       // The abstract timer queue does not have a time policy ...
diff --git a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp
index af5b8d89fab..55574c07818 100644
--- a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp
+++ b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp
@@ -238,7 +238,7 @@ Scheduler::svc (void)
                       ACE_TEXT ("(%t) activation queue shut down\n")));
           break;
         }
-      unique_ptr<ACE_Method_Request> mo (mo_p);
+      std::unique_ptr<ACE_Method_Request> mo (mo_p);
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) calling method request\n")));
@@ -486,7 +486,7 @@ run_main (int, ACE_TCHAR *[])
                   Scheduler (),
                   -1);
 
-  unique_ptr<Scheduler> scheduler(scheduler_ptr);
+  std::unique_ptr<Scheduler> scheduler(scheduler_ptr);
 
   if (scheduler->open () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index 1b821713e6a..3b297cf2356 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -488,7 +488,7 @@ TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from)
       ACE_NEW_RETURN (requests,
                       Requests,
                       0);
-      unique_ptr<Requests> requests_aptr (requests);
+      std::unique_ptr<Requests> requests_aptr (requests);
 
       if (requests->init (this->max_requests_, this->min_purge_count_) == -1
           || this->request_map_.bind (from, requests, entry) == -1)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
index fb6f26942a8..6d84e174637 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
@@ -38,7 +38,7 @@ AMI_Replication_Strategy::make_primary_strategy()
 {
   AMI_Primary_Replication_Strategy* result;
   ACE_NEW_RETURN(result, AMI_Primary_Replication_Strategy(mt_), 0);
-  unique_ptr<AMI_Primary_Replication_Strategy> holder(result);
+  std::unique_ptr<AMI_Primary_Replication_Strategy> holder(result);
   if (result->activate() == 0)
     return holder.release();
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index 51f5031d3c6..9e559b2fa09 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -116,7 +116,7 @@ void TAO_FTEC_Group_Manager::add_member (
   TAO_FTRTEC::Log(1, ACE_TEXT("add_member location = <%s>\n"),
     (const char*)info.the_location[0].id);
 
-  unique_ptr<TAO_FTEC_Group_Manager_Impl> new_impl(new TAO_FTEC_Group_Manager_Impl);
+  std::unique_ptr<TAO_FTEC_Group_Manager_Impl> new_impl(new TAO_FTEC_Group_Manager_Impl);
 
   new_impl->my_position = impl_->my_position;
   size_t pos = impl_->info_list.length();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index 77ed900759c..a9552172705 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace FTRTEC
 {
   namespace {
-    unique_ptr<Replication_Strategy> replication_strategy;
+    std::unique_ptr<Replication_Strategy> replication_strategy;
     int threads = 1;
     Replication_Service* service;
   }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 5f697d61847..7e4011c9948 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -279,7 +279,7 @@ TAO_IFR_Server::create_repository (void)
       CORBA::NO_MEMORY ()
     );
 
-  unique_ptr<TAO_ComponentRepository_i> safety (impl);
+  std::unique_ptr<TAO_ComponentRepository_i> safety (impl);
   TAO_IFR_Service_Utils::repo_ = impl;
 
   POA_CORBA::ComponentIR::Repository_tie<TAO_ComponentRepository_i> *impl_tie = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
index 53017616b8e..7534e413532 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
@@ -168,7 +168,7 @@ TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action,
                                              ),
                     CORBA::NO_MEMORY ());
 
-  unique_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
+  std::unique_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
 
   if (this->hash_map_.bind (id, recordstore.get ()) != 0)
     {
@@ -205,7 +205,7 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id,
                                              ),
                     CORBA::NO_MEMORY ());
 
-  unique_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
+  std::unique_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
 
   if (this->hash_map_.bind (id, recordstore.get ()) != 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index f4e55c7ff8c..e57b755d312 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -228,7 +228,7 @@ TAO_Notify_EventChannelFactory::load_topology (void)
   if (this->topology_factory_ != 0)
   {
     // create_loader will open and load the persistence file for validation
-    unique_ptr<TAO_Notify::Topology_Loader> tl(this->topology_factory_->create_loader());
+    std::unique_ptr<TAO_Notify::Topology_Loader> tl(this->topology_factory_->create_loader());
     if (tl.get () != 0)
     {
       tl->load (this);
@@ -351,7 +351,7 @@ TAO_Notify_EventChannelFactory::change_to_parent (void)
       ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->topology_save_lock_, CORBA::INTERNAL ());
       if (seq == this->topology_save_seq_)
       {
-        unique_ptr<TAO_Notify::Topology_Saver> saver(this->topology_factory_->create_saver());
+        std::unique_ptr<TAO_Notify::Topology_Saver> saver(this->topology_factory_->create_saver());
         if (saver.get() != 0)
         {
           this->save_persistent(*saver);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 2684d93306f..a0c4b0c7f22 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -77,7 +77,7 @@ namespace TAO_Notify
     if (result)
     {
       this->live_ = false;
-      unique_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream);
+      std::unique_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream);
       // xml input source will take ownership
 
       if (fstm->open (this->file_name_.c_str ()) == 0)
@@ -127,7 +127,7 @@ namespace TAO_Notify
     ACE_ASSERT (root != 0);
     this->live_ = true;
 
-    unique_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream);
+    std::unique_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream);
     // xml input source will take ownership
 
     if (fstm->open (this->file_name_.c_str ()) == 0)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 6bdd8ff3b94..c17e8d3c363 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -284,7 +284,7 @@ void TAO::PG_FactoryRegistry::register_factory (
   METHOD_ENTRY(TAO::PG_FactoryRegistry::register_factory);
 
   RoleInfo * role_info = 0;
-  unique_ptr<RoleInfo> safe_entry;
+  std::unique_ptr<RoleInfo> safe_entry;
   if (this->registry_.find(role, role_info) != 0)
     {
       ORBSVCS_DEBUG(( LM_DEBUG,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index cb18ce6b8ca..5a09a71c2f4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -171,7 +171,7 @@ TAO_PG_ObjectGroupManager::add_member_i (
                             ENOMEM),
                           CORBA::COMPLETED_NO));
 
-      unique_ptr<TAO_PG_ObjectGroup_Array> safe_groups (groups);
+      std::unique_ptr<TAO_PG_ObjectGroup_Array> safe_groups (groups);
 
       // This should not fail!
       if (this->location_map_.bind (the_location, groups) != 0)
@@ -490,7 +490,7 @@ TAO_PG_ObjectGroupManager::create_object_group (
                         ENOMEM),
                       CORBA::COMPLETED_NO));
 
-  unique_ptr<TAO_PG_ObjectGroup_Map_Entry> safe_group_entry (group_entry);
+  std::unique_ptr<TAO_PG_ObjectGroup_Map_Entry> safe_group_entry (group_entry);
 
   // Set the RepositoryId associated with the created ObjectGroup_Map
   // entry.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index 87067baf08a..a4fefe04827 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -169,7 +169,7 @@ TAO::SSLIOP::ORBInitializer::post_init (
                     TAO::SSLIOP::CredentialsAcquirerFactory,
                     CORBA::NO_MEMORY ());
 
-  unique_ptr<TAO::SSLIOP::CredentialsAcquirerFactory> safe_factory;
+  std::unique_ptr<TAO::SSLIOP::CredentialsAcquirerFactory> safe_factory;
 
   tao_curator->register_acquirer_factory ("SL3TLS", factory);
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 7c8de9c5ea5..a8f195f9648 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -200,7 +200,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
   this->orb_manager_.activate_poa_manager ();
 
   // Create a Trader Object and set its Service Type Repository.
-  unique_ptr<TAO_Trader_Factory::TAO_TRADER> auto_trader (TAO_Trader_Factory::create_trader (argc, argv));
+  std::unique_ptr<TAO_Trader_Factory::TAO_TRADER> auto_trader (TAO_Trader_Factory::create_trader (argc, argv));
 
   this->trader_ = std::move(auto_trader);