From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 8 Oct 2016 18:48:57 +0000 (-0400)
Subject: Make ref(owned<T>) explicit.
X-Git-Url: https://src.bluestatic.org/?a=commitdiff_plain;h=35f95fd067fd1c5ce6cf25383e6579f66cc48e64;p=zcpointer.git

Make ref(owned<T>) explicit.
---

diff --git a/zcpointer.h b/zcpointer.h
index 2edf05f..27bffa9 100644
--- a/zcpointer.h
+++ b/zcpointer.h
@@ -87,7 +87,7 @@ class owned : public std::unique_ptr<T, internal::OwnedPtrDeleter<T>> {
 template <typename T>
 class ref {
  public:
-  ref(owned<T>& o) : ptr_(o.GetRawPointer()), deleter_(o.get_deleter()) {
+  explicit ref(owned<T>& o) : ptr_(o.GetRawPointer()), deleter_(o.get_deleter()) {
     deleter_.AddRef(this);
   }
 
@@ -98,38 +98,19 @@ class ref {
   }
 
   ref<T>& operator=(ref<T> o) {
-    ptr_ = o.ptr_;
-    deleter_ = o.deleter_;
-    deleted_ = o.deleted_;
-    if (!deleted_) {
-      deleter_.AddRef(this);
-    }
-    return *this;
+    return ref(o);
   }
 
   ~ref() {
+    MarkDeleted();
     deleter_.RemoveRef(this);
   }
 
-#if 0
-  operator T*() const {
-    CheckDeleted();
-    return ptr_;
-  }
-#endif
-
   T* operator->() const {
     CheckDeleted();
     return ptr_;
   }
 
-#if 0
-  T* get() {
-    CheckDeleted();
-    return ptr_;
-  }
-#endif
-
  protected:
   friend class internal::OwnedPtrDeleter<T>;