Add basic deleter support to wxSharedPtr<T>.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -30,6 +30,14 @@ public:
|
||||
m_ref = new reftype(ptr);
|
||||
}
|
||||
|
||||
template<typename Deleter>
|
||||
wxEXPLICIT wxSharedPtr(T* ptr, Deleter d)
|
||||
: m_ref(NULL)
|
||||
{
|
||||
if (ptr)
|
||||
m_ref = new reftype_with_deleter<Deleter>(ptr, d);
|
||||
}
|
||||
|
||||
~wxSharedPtr() { Release(); }
|
||||
wxSharedPtr(const wxSharedPtr& tocopy) { Acquire(tocopy.m_ref); }
|
||||
|
||||
@@ -91,6 +99,14 @@ public:
|
||||
m_ref = new reftype(ptr);
|
||||
}
|
||||
|
||||
template<typename Deleter>
|
||||
void reset(T* ptr, Deleter d)
|
||||
{
|
||||
Release();
|
||||
if (ptr)
|
||||
m_ref = new reftype_with_deleter<Deleter>(ptr, d);
|
||||
}
|
||||
|
||||
bool unique() const { return (m_ref ? m_ref->m_count == 1 : true); }
|
||||
long use_count() const { return (m_ref ? (long)m_ref->m_count : 0); }
|
||||
|
||||
@@ -98,10 +114,24 @@ private:
|
||||
|
||||
struct reftype
|
||||
{
|
||||
reftype( T* ptr = NULL, unsigned count = 1 ) : m_ptr(ptr), m_count(count) {}
|
||||
reftype(T* ptr) : m_ptr(ptr), m_count(1) {}
|
||||
virtual ~reftype() {}
|
||||
virtual void delete_ptr() { delete m_ptr; }
|
||||
|
||||
T* m_ptr;
|
||||
wxAtomicInt m_count;
|
||||
}* m_ref;
|
||||
};
|
||||
|
||||
template<typename Deleter>
|
||||
struct reftype_with_deleter : public reftype
|
||||
{
|
||||
reftype_with_deleter(T* ptr, Deleter d) : reftype(ptr), m_deleter(d) {}
|
||||
virtual void delete_ptr() { m_deleter(this->m_ptr); }
|
||||
|
||||
Deleter m_deleter;
|
||||
};
|
||||
|
||||
reftype* m_ref;
|
||||
|
||||
void Acquire(reftype* ref)
|
||||
{
|
||||
@@ -116,7 +146,7 @@ private:
|
||||
{
|
||||
if (!wxAtomicDec( m_ref->m_count ))
|
||||
{
|
||||
delete m_ref->m_ptr;
|
||||
m_ref->delete_ptr();
|
||||
delete m_ref;
|
||||
}
|
||||
m_ref = NULL;
|
||||
|
Reference in New Issue
Block a user