Improvements to recptr

recptr is now default constructible. You can evaluate it as a bool to determine if it contains a non-null pointer. Copying or copy assigning an empty recptr no longer crashes.

1 files changed, 17 insertions, 2 deletions

@@ -14,6 +14,8 @@ namespace hatkirby {
   class recptr {
   public:
 
+    recptr() = default;
+
     recptr(T* ptr) : ptr_(ptr)
     {
     }
@@ -24,8 +26,11 @@ namespace hatkirby {
     }
 
     recptr(const recptr& other)
-      : ptr_(new T(*other.ptr_))
     {
+      if (other.ptr_)
+      {
+        ptr_ = new T(*other.ptr_);
+      }
     }
 
     recptr(recptr&& other)
@@ -38,9 +43,14 @@ namespace hatkirby {
       if (ptr_)
       {
         delete ptr_;
+
+        ptr_ = nullptr;
       }
 
-      ptr_ = new T(*other.ptr_);
+      if (other.ptr_)
+      {
+        ptr_ = new T(*other.ptr_);
+      }
 
       return *this;
     }
@@ -79,6 +89,11 @@ namespace hatkirby {
       return ptr_;
     }
 
+    operator bool() const
+    {
+      return (ptr_ != nullptr);
+    }
+
   private:
 
     T* ptr_ = nullptr;