aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-12-01 14:24:37 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:12:07 -0300
commit96488c9cfd16c6ef9800c678c83d271343c2a813 (patch)
tree3ed374f636d1b8e062175a62727eeeee222c7524
parent8655647b9c23558aa21b155bd4246c6433dbeaf2 (diff)
Remove objectDeleter function and use the well known Shiboken::callCppDestructor.
-rw-r--r--libshiboken/typeresolver.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/libshiboken/typeresolver.h b/libshiboken/typeresolver.h
index f959010fd..6a3750c1b 100644
--- a/libshiboken/typeresolver.h
+++ b/libshiboken/typeresolver.h
@@ -48,12 +48,6 @@ inline void* pythonToObjectType(PyObject* pyobj, void** data, bool)
}
template <typename T>
-inline void objectDeleter(void* data)
-{
- delete reinterpret_cast<T*>(data);
-}
-
-template <typename T>
inline PyObject* objectTypeToPython(void* cptr)
{
return Shiboken::Converter<T*>::toPython(*reinterpret_cast<T**>(cptr));
@@ -84,7 +78,7 @@ public:
template<typename T>
static TypeResolver* createValueTypeResolver(const char* typeName)
{
- return new TypeResolver(typeName, &Shiboken::Converter<T>::toPython, &pythonToValueType<T>, SbkType<T>(), &objectDeleter<T>);
+ return new TypeResolver(typeName, &Shiboken::Converter<T>::toPython, &pythonToValueType<T>, SbkType<T>(), &callCppDestructor<T>);
}
template<typename T>