Source Format Enforcement (#1234)

[thirdparty/squid.git] / src / base / RefCount.h

diff --git a/src/base/RefCount.h b/src/base/RefCount.h
index 85a5477249901e016548870a5c696e00fb7e2384..60d8c2093c7fec44b3a45330aedb322eb0a8da00 100644 (file)
--- a/src/base/RefCount.h
+++ b/src/base/RefCount.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2023 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -27,7 +27,7 @@ class RefCount
 {
 
 public:
-    RefCount () : p_ (NULL) {}
+    RefCount () : p_ (nullptr) {}
 
     RefCount (C const *p) : p_(p) { reference (*this); }
 
@@ -39,11 +39,15 @@ public:
         reference (p);
     }
 
-#if __cplusplus >= 201103L
     RefCount (RefCount &&p) : p_(std::move(p.p_)) {
-        p.p_=NULL;
+        p.p_=nullptr;
+    }
+
+    /// Base::Pointer = Derived::Pointer
+    template <class Other>
+    RefCount(const RefCount<Other> &p): p_(p.getRaw()) {
+        reference(*this);
     }
-#endif
 
     RefCount& operator = (const RefCount& p) {
         // DO NOT CHANGE THE ORDER HERE!!!
@@ -54,15 +58,13 @@ public:
         return *this;
     }
 
-#if __cplusplus >= 201103L
     RefCount& operator = (RefCount&& p) {
         if (this != &p) {
             dereference(p.p_);
-            p.p_ = NULL;
+            p.p_ = nullptr;
         }
         return *this;
     }
-#endif
 
     explicit operator bool() const { return p_; }
 
@@ -70,11 +72,12 @@ public:
 
     C * operator-> () const {return const_cast<C *>(p_); }
 
-    C & operator * () const {return *const_cast<C *>(p_); }
-
-    C const * getRaw() const {return p_; }
+    C & operator * () const {
+        assert(p_);
+        return *const_cast<C *>(p_);
+    }
 
-    C * getRaw() {return const_cast<C *>(p_); }
+    C * getRaw() const { return const_cast<C *>(p_); }
 
     bool operator == (const RefCount& p) const {
         return p.p_ == p_;
@@ -84,8 +87,20 @@ public:
         return p.p_ != p_;
     }
 
+    template <class Other>
+    bool operator ==(const Other * const p) const
+    {
+        return p == p_;
+    }
+
+    template <class Other>
+    bool operator !=(const Other * const p) const
+    {
+        return p != p_;
+    }
+
 private:
-    void dereference(C const *newP = NULL) {
+    void dereference(C const *newP = nullptr) {
         /* Setting p_ first is important:
         * we may be freed ourselves as a result of
         * delete p_;
@@ -109,7 +124,7 @@ private:
 template <class C>
 inline std::ostream &operator <<(std::ostream &os, const RefCount<C> &p)
 {
-    if (p != NULL)
+    if (p != nullptr)
         return os << p.getRaw() << '*' << p->LockCount();
     else
         return os << "NULL";