Merge pull request #4250 from jwillemsen/jwi-autoptr

Make use of unique_ptr and removed some obsolete includes (cherry picked from commit 3c7cd94) # Conflicts: # dds/DCPS/Service_Participant.cpp
OpenDDS · Apr 26, 2024 · ceaeee4 · ceaeee4
1 parent 6f16832
commit ceaeee4
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 8 deletions.
diff --git a/dds/DCPS/DataDurabilityCache.h b/dds/DCPS/DataDurabilityCache.h
@@ -222,7 +222,6 @@ class DataDurabilityCache {
   void init();
 
 private:
-
   /// Allocator used to allocate memory for sample map and lists.
   unique_ptr<ACE_Allocator> const allocator_;
 

diff --git a/dds/DCPS/DataReaderImpl.cpp b/dds/DCPS/DataReaderImpl.cpp
@@ -39,7 +39,6 @@
 #include <dds/DdsDcpsGuidTypeSupportImpl.h>
 
 #include <ace/Reactor.h>
-#include <ace/Auto_Ptr.h>
 #include <ace/OS_NS_sys_time.h>
 
 #include <cstdio>

diff --git a/dds/DCPS/DataWriterImpl.cpp b/dds/DCPS/DataWriterImpl.cpp
@@ -44,7 +44,6 @@
 #include <dds/DdsDcpsGuidTypeSupportImpl.h>
 
 #include <ace/Reactor.h>
-#include <ace/Auto_Ptr.h>
 
 #include <stdexcept>
 

diff --git a/dds/DCPS/ReplayerImpl.cpp b/dds/DCPS/ReplayerImpl.cpp
@@ -39,7 +39,6 @@
 #include "transport/framework/TransportCustomizedElement.h"
 
 #include "ace/Reactor.h"
-#include "ace/Auto_Ptr.h"
 
 #include <stdexcept>
 

diff --git a/dds/DCPS/Service_Participant.cpp b/dds/DCPS/Service_Participant.cpp
@@ -32,7 +32,6 @@
 #include <ace/Configuration_Import_Export.h>
 #include <ace/Service_Config.h>
 #include <ace/Argv_Type_Converter.h>
-#include <ace/Auto_Ptr.h>
 #include <ace/Sched_Params.h>
 #include <ace/Malloc_Allocator.h>
 #include <ace/OS_NS_unistd.h>

diff --git a/dds/DCPS/transport/framework/ThreadPerConnectionSendTask.cpp b/dds/DCPS/transport/framework/ThreadPerConnectionSendTask.cpp
@@ -15,8 +15,7 @@
 #include "EntryExit.h"
 #include "dds/DCPS/DataSampleElement.h"
 #include "dds/DCPS/Service_Participant.h"
-
-#include "ace/Auto_Ptr.h"
+#include "dds/DCPS/unique_ptr.h"
 
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -44,7 +43,7 @@ int ThreadPerConnectionSendTask::add_request(SendStrategyOpType op,
 {
   DBG_ENTRY("ThreadPerConnectionSendTask", "add");
 
-  ACE_Auto_Ptr<SendRequest> req(new SendRequest);
+  unique_ptr<SendRequest> req(new SendRequest);
   req->op_ = op;
   req->element_ = element;