Make use of std::unique_ptr

    * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp:
    * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h:
    * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h:
    * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h:
    * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp:
    * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h:
    * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp:
    * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h:

8 files changed, 13 insertions, 21 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index 9e559b2fa09..e4597a137f1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -155,7 +155,7 @@ void TAO_FTEC_Group_Manager::add_member (
         publisher->setup_info(new_impl->info_list,
                               new_impl->my_position,
                               object_group_ref_version));
-      ACE_auto_ptr_reset(group_info, group_info1.release());
+      group_info = std::move(group_info1);
 
       last_one = true;
     }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
index cce2d0abd0a..00207ae4d6e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
@@ -18,7 +18,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 struct TAO_FTEC_Group_Manager_Impl;
@@ -39,8 +38,7 @@ public:
     const FTRT::ManagerInfoList & info_list,
     CORBA::ULong object_group_ref_version);
 
-  void join_group (
-    const FTRT::ManagerInfo & info);
+  void join_group (const FTRT::ManagerInfo & info);
 
   void add_member (
     const FTRT::ManagerInfo & info,
@@ -50,13 +48,10 @@ public:
     const FTRT::Location & crashed_location,
     CORBA::ULong object_group_ref_version);
 
-  void replica_crashed (
-    const FTRT::Location & location);
+  void replica_crashed (const FTRT::Location & location);
 
 private:
-  virtual void get_state (
-        FtRtecEventChannelAdmin::EventChannelState & s
-      )=0;
+  virtual void get_state (FtRtecEventChannelAdmin::EventChannelState & s)=0;
 
   virtual void connection_closed();
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
index f2bae73917b..a2715144718 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -34,7 +34,6 @@ public:
   virtual void activate (
      RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy);
 
-
     // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
index 0544fe8c8ed..ec5d82947ef 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
@@ -43,7 +43,6 @@ class TAO_FTEC_SupplierAdmin
              FtRtecEventChannelAdmin::SupplierAdminState>
 {
 public:
-
   static const FtRtecEventChannelAdmin::OperationType OBTAIN_ID;
 
   typedef FT_ProxyAdmin<TAO_FTEC_SupplierAdmin,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index 8cddd9bcb50..80f63e40ab1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -27,8 +27,7 @@ namespace FTRTEC {
   }
 
   int
-  Fault_Detector_Loader::init (int argc,
-    ACE_TCHAR* argv[])
+  Fault_Detector_Loader::init (int argc, ACE_TCHAR* argv[])
   {
     static int initialized = 0;
 
@@ -54,7 +53,7 @@ namespace FTRTEC {
     }
     else {
       ACE_NEW_RETURN(detector, TCP_Fault_Detector, -1);
-      ACE_auto_ptr_reset(detector_, detector);
+      detector_.reset (detector);
     }
     return detector_->init(argc, argv);
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
index ec04504695b..23113d1dd0d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
@@ -19,7 +19,7 @@
 
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,16 +34,16 @@ namespace FTRTEC {
   {
   public:
     /// Constructor.
-    Fault_Detector_Loader (void);
+    Fault_Detector_Loader ();
 
     /// Destructor.
-    virtual ~Fault_Detector_Loader (void);
+    virtual ~Fault_Detector_Loader ();
 
     virtual int init (int argc,
       ACE_TCHAR* []);
     Fault_Detector* detector();
   private:
-    auto_ptr<Fault_Detector> detector_;
+    std::unique_ptr<Fault_Detector> detector_;
   };
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index a2280c5c416..4e757109620 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -144,7 +144,7 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info)
       }
     }
   }
-  info_ = info;
+  info_ = std::move(info);
 }
 TAO_END_VERSIONED_NAMESPACE_DECL
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
index 878e956a536..b4f6b370283 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -16,7 +16,7 @@
 #include "ace/Vector_T.h"
 #include "ace/Singleton.h"
 #include "ace/Synch.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -38,7 +38,7 @@ public:
     BackupList backups;
   };
 
-  typedef auto_ptr<Info> Info_ptr;
+  typedef std::unique_ptr<Info> Info_ptr;
   friend class ACE_Singleton<GroupInfoPublisherBase, TAO_SYNCH_MUTEX>;
 
   void subscribe(TAO_FTEC_Become_Primary_Listener* listener);