diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-10-30 00:14:17 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-10-30 00:14:17 +0000 |
| commit | 978b06eb1a31471ebda868ddf526cb40a38fe652 (patch) | |
| tree | 1b76dfe3033bd301dec3d9daff52c33415127503 /lib/base | |
| parent | 0c59a4279f93f08fe95fca5f2e55f3e025f0cceb (diff) | |
| download | enigma2-978b06eb1a31471ebda868ddf526cb40a38fe652.tar.gz enigma2-978b06eb1a31471ebda868ddf526cb40a38fe652.zip | |
small refcounting fixes, add private operator delete to iObject
Diffstat (limited to 'lib/base')
| -rw-r--r-- | lib/base/ebase.h | 2 | ||||
| -rw-r--r-- | lib/base/object.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/base/ebase.h b/lib/base/ebase.h index c86c177d..84845a95 100644 --- a/lib/base/ebase.h +++ b/lib/base/ebase.h @@ -155,7 +155,6 @@ private: int requested; // requested events (POLLIN, ...) void activate(int what) { /*emit*/ activated(what); } eSocketNotifier(eMainloop *context, int fd, int req, bool startnow); - void operator delete(void *pmem) { ::operator delete(pmem); } public: /** * \brief Constructs a eSocketNotifier. @@ -281,7 +280,6 @@ class eTimer: iObject void activate(); eTimer(eMainloop *context): context(*context), bActive(false) { } - void operator delete(void *pmem) { ::operator delete(pmem); } public: /** * \brief Constructs a timer. diff --git a/lib/base/object.h b/lib/base/object.h index f0e0e9a5..a3268d4f 100644 --- a/lib/base/object.h +++ b/lib/base/object.h @@ -17,6 +17,7 @@ private: /* we don't allow the default operator here, as it would break the refcount. */ void operator=(const iObject &); protected: + void operator delete(void *p) { ::operator delete(p); } virtual ~iObject() { } #ifdef SWIG virtual void AddRef()=0; |
