Add nullptr comparison operator to parented_ptr

gramanas · Feb 27, 2017 · b165107 · b165107
1 parent 7b6370d
commit b165107
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/src/util/parented_ptr.h b/src/util/parented_ptr.h
@@ -2,6 +2,7 @@
 #define UTIL_PARENTED_PTR_H
 
 #include <QPointer>
+#include <cstddef>
 #include "util/assert.h"
 
 /**
@@ -22,7 +23,7 @@ class parented_ptr {
     template <typename U>
     parented_ptr(parented_ptr<U>&& u, typename std::enable_if<std::is_convertible<U*, T*>::value, void>::type * = 0)
             : m_pObject(u.get()) {
-        if (u.m_pObject != nullptr) {
+        if (u != nullptr) {
             DEBUG_ASSERT(u->parent() != nullptr);
         }
     }
@@ -108,6 +109,16 @@ inline bool operator== (const parented_ptr<T>& lhs, const parented_ptr<U>& rhs)
     return lhs.get() == rhs.get();
 }
 
+template<typename T>
+inline bool operator== (const parented_ptr<T>& p, std::nullptr_t) {
+    return p.get() == nullptr;
+}
+
+template<typename T>
+inline bool operator== (std::nullptr_t, const parented_ptr<T>& p) {
+    return p.get() == nullptr;
+}
+
 template<typename T, typename U>
 inline bool operator!= (const T* lhs, const parented_ptr<U>& rhs) {
     return !(lhs == rhs.get());
@@ -123,6 +134,16 @@ inline bool operator!= (const parented_ptr<T>& lhs, const parented_ptr<U>& rhs)
     return !(lhs.get() == rhs.get());
 }
 
+template<typename T>
+inline bool operator!= (const parented_ptr<T>& p, std::nullptr_t) {
+    return !(p == nullptr);
+}
+
+template<typename T>
+inline bool operator!= (std::nullptr_t, const parented_ptr<T>& p) {
+    return !(nullptr == p);
+}
+
 } // namespace
 
 #endif // UTIL_PARENTED_PTR_H