Fix some issues in DataTree using OptionalOwnershipPointer

src/fspp/utils/OptionalOwnershipPointer.h

@@ -0,0 +1,34 @@
+#pragma once
+#ifndef FSPP_UTILS_OPTIONALOWNERSHIPPOINTER_H_
+#define FSPP_UTILS_OPTIONALOWNERSHIPPOINTER_H_
+
+#include <memory>
+
+namespace fspp {
+namespace ptr {
+
+//TODO Test cases
+
+template<typename T>
+using optional_ownership_ptr = std::unique_ptr<T, std::function<void(T*)>>;
+
+template<typename T>
+optional_ownership_ptr<T> WithOwnership(std::unique_ptr<T> obj) {
+  auto deleter = obj.get_deleter();
+  return optional_ownership_ptr<T>(obj.release(), [deleter](T* obj){deleter(obj);});
+}
+
+template<typename T>
+optional_ownership_ptr<T> WithoutOwnership(T *obj) {
+  return optional_ownership_ptr<T>(obj, [](T*){});
+}
+
+template<typename T>
+optional_ownership_ptr<T> null() {
+  return WithoutOwnership<T>(nullptr);
+}
+
+}
+}
+
+#endif

src/fspp/utils/pointer.h

@@ -8,11 +8,12 @@ namespace fspp {
 
   template<typename DST, typename SRC>
   inline std::unique_ptr<DST> dynamic_pointer_move(std::unique_ptr<SRC> &source) {
-	DST *casted = dynamic_cast<DST*>(source.get());
+    //TODO Deleter
-	if (casted != nullptr) {
+    DST *casted = dynamic_cast<DST*>(source.get());
+    if (casted != nullptr) {
       source.release();
-	}
+    }
-	return std::unique_ptr<DST>(casted);
+    return std::unique_ptr<DST>(casted);
   }
 }