aboutsummaryrefslogtreecommitdiffstats
path: root/libshiboken
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-06-29 10:03:03 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2010-06-29 10:23:44 -0300
commit346b26bf5a37117f2fca587d8add5611910e2736 (patch)
treea74626af3038e3c4d1dd02c44d64918daf311e48 /libshiboken
parent72cf2ba5a39e3f2008fbb5e24ed59ff3cb3955fb (diff)
Fix bug#256 - "PySide does not support signals with containers."
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org> Renato Araújo <renato.filho@openbossa.org>
Diffstat (limited to 'libshiboken')
-rw-r--r--libshiboken/conversions.h3
-rw-r--r--libshiboken/typeresolver.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h
index 065820447..c3e3c4fab 100644
--- a/libshiboken/conversions.h
+++ b/libshiboken/conversions.h
@@ -562,6 +562,7 @@ struct StdListConverter
}
return true;
}
+ static PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<StdList*>(cppObj)); }
static PyObject* toPython(const StdList& cppobj)
{
PyObject* result = PyList_New((int) cppobj.size());
@@ -610,6 +611,7 @@ struct StdPairConverter
}
return true;
}
+ static PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<StdPair*>(cppObj)); }
static PyObject* toPython(const StdPair& cppobj)
{
typename StdPair::first_type first(cppobj.first);
@@ -658,6 +660,7 @@ struct StdMapConverter
return true;
}
+ static PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<StdMap*>(cppObj)); }
static PyObject* toPython(const StdMap& cppobj)
{
PyObject* result = PyDict_New();
diff --git a/libshiboken/typeresolver.cpp b/libshiboken/typeresolver.cpp
index d2e042ba4..37b8b0174 100644
--- a/libshiboken/typeresolver.cpp
+++ b/libshiboken/typeresolver.cpp
@@ -69,7 +69,6 @@ void Shiboken::initTypeResolver()
static void registerTypeResolver(TypeResolver* resolver)
{
- assert(typeResolverMap.find(resolver->typeName()) == typeResolverMap.end());
typeResolverMap[resolver->typeName()] = resolver;
}