Switch to unique_ptrs for managing the related objects

AIDASoft · Sep 25, 2024 · 5c40955 · 5c40955
1 parent a8bcf4a
commit 5c40955
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/include/podio/detail/Link.h b/include/podio/detail/Link.h
@@ -92,10 +92,10 @@ class LinkT {
     auto tmp = new LinkObjT(podio::ObjectID{}, m_obj->data);
     if (cloneRelations) {
       if (m_obj->m_from) {
-        tmp->m_from = new FromT(*m_obj->m_from);
+        tmp->m_from = std::make_unique<FromT>(*m_obj->m_from);
       }
       if (m_obj->m_to) {
-        tmp->m_to = new ToT(*m_obj->m_to);
+        tmp->m_to = std::make_unique<ToT>(*m_obj->m_to);
       }
     }
     return MutableLink<FromU, ToU>(podio::utils::MaybeSharedPtr(tmp, podio::utils::MarkOwned));
@@ -139,8 +139,7 @@ class LinkT {
                                  detail::isDefaultHandleType<FromU>,
                              int> = 0>
   void setFrom(FromU value) {
-    delete m_obj->m_from;
-    m_obj->m_from = new detail::GetDefaultHandleType<FromU>(value);
+    m_obj->m_from = std::make_unique<detail::GetDefaultHandleType<FromU>>(value);
   }
 
   /// Set the related-from object
@@ -184,8 +183,7 @@ class LinkT {
                                  detail::isDefaultHandleType<ToU>,
                              int> = 0>
   void setTo(ToU value) {
-    delete m_obj->m_to;
-    m_obj->m_to = new detail::GetDefaultHandleType<ToU>(value);
+    m_obj->m_to = std::make_unique<detail::GetDefaultHandleType<ToU>>(value);
   }
 
   /// Set the related-to object

diff --git a/include/podio/detail/LinkObj.h b/include/podio/detail/LinkObj.h
@@ -5,6 +5,8 @@
 
 #include "podio/ObjectID.h"
 
+#include <memory>
+
 namespace podio {
 
 template <typename FromT, typename ToT>
@@ -36,16 +38,14 @@ class LinkObj {
   LinkObj& operator=(const LinkObj&) = delete;
 
   /// Destructor
-  ~LinkObj() {
-    delete m_from;
-    delete m_to;
-  }
+  ~LinkObj() = default;
 
 public:
   podio::ObjectID id{};
   LinkData data{1.0f};
-  FromT* m_from{nullptr};
-  ToT* m_to{nullptr};
+
+  std::unique_ptr<FromT> m_from{nullptr};
+  std::unique_ptr<ToT> m_to{nullptr};
 };
 
 } // namespace podio