git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a8f6d33
)
add helper object for eSmartPtr, resolving a race condition.
author
Felix Domke
<tmbinc@elitedvb.net>
Thu, 27 May 2004 14:28:44 +0000
(14:28 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Thu, 27 May 2004 14:28:44 +0000
(14:28 +0000)
lib/base/smartptr.h
patch
|
blob
|
history
diff --git
a/lib/base/smartptr.h
b/lib/base/smartptr.h
index 029fd1dc721cd041a1dbfa511ee357f3d6a6d562..c89763e37fe98ed8666ee1593de17ea0d0dcd030 100644
(file)
--- a/
lib/base/smartptr.h
+++ b/
lib/base/smartptr.h
@@
-7,6
+7,22
@@
template<class T>
class ePtr
{
template<class T>
class ePtr
{
+ /* read doc/iObject about the ePtrHelper */
+ template<class T1>
+ class ePtrHelper
+ {
+ T1 *m_obj;
+ public:
+ inline ePtrHelper(T1 *obj): m_obj(obj)
+ {
+ m_obj->AddRef();
+ }
+ inline ~ePtrHelper()
+ {
+ m_obj->Release();
+ }
+ inline T1* operator->() { return m_obj; }
+ };
protected:
T *ptr;
public:
protected:
T *ptr;
public:
@@
-51,7
+67,12
@@
public:
ptr->Release();
}
T* &ptrref() { assert(!ptr); return ptr; }
ptr->Release();
}
T* &ptrref() { assert(!ptr); return ptr; }
- T* operator->() { assert(ptr); return ptr; }
+ ePtrHelper<T> operator->() { assert(ptr); return ePtrHelper<T>(ptr); }
+
+ /* for const objects, we don't need the helper, as they can't */
+ /* be changed outside the program flow. at least this is */
+ /* what the compiler assumes, so in case you're using const */
+ /* ePtrs note that they have to be const. */
const T* operator->() const { assert(ptr); return ptr; }
operator T*() const { return this->ptr; }
};
const T* operator->() const { assert(ptr); return ptr; }
operator T*() const { return this->ptr; }
};