diff options
Diffstat (limited to 'common/ptr.h')
| -rw-r--r-- | common/ptr.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/common/ptr.h b/common/ptr.h index eea3c39882..c6fcaa4f75 100644 --- a/common/ptr.h +++ b/common/ptr.h @@ -121,7 +121,7 @@ public: ~SharedPtr() { decRef(); } - SharedPtr &operator =(const SharedPtr &r) { + SharedPtr &operator=(const SharedPtr &r) { if (r._refCount) ++(*r._refCount); decRef(); @@ -134,7 +134,7 @@ public: } template<class T2> - SharedPtr &operator =(const SharedPtr<T2> &r) { + SharedPtr &operator=(const SharedPtr<T2> &r) { if (r._refCount) ++(*r._refCount); decRef(); @@ -146,8 +146,8 @@ public: return *this; } - ValueType &operator *() const { assert(_pointer); return *_pointer; } - Pointer operator ->() const { assert(_pointer); return _pointer; } + ValueType &operator*() const { assert(_pointer); return *_pointer; } + Pointer operator->() const { assert(_pointer); return _pointer; } /** * Returns the plain pointer value. Be sure you know what you @@ -171,6 +171,16 @@ public: bool unique() const { return refCount() == 1; } /** + * Resets the SharedPtr object to a NULL pointer. + */ + void reset() { + decRef(); + _deletion = 0; + _refCount = 0; + _pointer = 0; + } + + /** * Returns the number of references to the assigned pointer. * This should just be used for debugging purposes. */ @@ -199,12 +209,12 @@ private: } // end of namespace Common template<class T1, class T2> -bool operator ==(const Common::SharedPtr<T1> &l, const Common::SharedPtr<T2> &r) { +bool operator==(const Common::SharedPtr<T1> &l, const Common::SharedPtr<T2> &r) { return l.get() == r.get(); } template<class T1, class T2> -bool operator !=(const Common::SharedPtr<T1> &l, const Common::SharedPtr<T2> &r) { +bool operator!=(const Common::SharedPtr<T1> &l, const Common::SharedPtr<T2> &r) { return l.get() != r.get(); } |