finally fix satfinder with new config

[enigma2.git] / lib / base / smartptr.h

diff --git a/lib/base/smartptr.h b/lib/base/smartptr.h
index 7e441ab2976ab67e48e67b89064a72c22fe9ec7f..6c3dbc2f0f9c6502a8df06e3f13c8caa311fb601 100644 (file)
--- a/lib/base/smartptr.h
+++ b/lib/base/smartptr.h
@@ -3,14 +3,9 @@
 
 #include "object.h"
 #include <stdio.h>
+#include <lib/python/swig.h>
 
-#ifdef SWIG
-#define TEMPLATE_TYPEDEF(x, y) \
-%template(y) x; \
-typedef x y
-#else
-#define TEMPLATE_TYPEDEF(x, y) typedef x y
-#endif
+inline void ptrAssert(void *p) { if (!p) *(unsigned long*)0=0; }
 
 template<class T>
 class ePtr
@@ -61,8 +56,10 @@ public:
        
        T* grabRef() { if (!ptr) return 0; ptr->AddRef(); return ptr; }
        T* &ptrref() { assert(!ptr); return ptr; }
-       T* operator->() const { assert(ptr); return ptr; }
+       T* operator->() const { ptrAssert(ptr); return ptr; }
        operator T*() const { return this->ptr; }
+       
+       operator bool() const { return !!this->ptr; }
 };
 
 
@@ -136,7 +133,7 @@ public:
        
        T* grabRef() { if (!ptr) return 0; ptr->AddRef(); ptr->AddUse(); return ptr; }
        T* &ptrref() { assert(!ptr); return ptr; }
-       T* operator->() const { assert(ptr); return ptr; }
+       T* operator->() const { ptrAssert(ptr); return ptr; }
        operator T*() const { return this->ptr; }
 };
 
@@ -184,13 +181,13 @@ public:
        }
        
        
-       ePtrHelper<T> operator->() { assert(ptr); return ePtrHelper<T>(ptr); }
+       ePtrHelper<T> operator->() { ptrAssert(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 */
                        /* eMutablePtrs note that they have to be const. */
-       const T* operator->() const { assert(ptr); return ptr; }
+       const T* operator->() const { ptrAssert(ptr); return ptr; }
 };
 #endif