summaryrefslogtreecommitdiffstats
path: root/libshiboken/conversions.h
diff options
context:
space:
mode:
authorHugo Lima <hugo.lima@openbossa.org>2010-03-03 17:47:12 -0300
committerHugo Lima <hugo.lima@openbossa.org>2010-03-03 17:47:12 -0300
commit36376eb1c97cad139b40197cefd6650e8afc49b2 (patch)
treeee632b8b4e745a546921ec94f32e06e9875e3087 /libshiboken/conversions.h
parenta6c665dd07b5841e033f1558b2fcf391d5fba403 (diff)
parent8287b5b65ac0bd697f45bdebe833ad36263dfc75 (diff)
downloadshiboken-36376eb1c97cad139b40197cefd6650e8afc49b2.tar.gz
shiboken-36376eb1c97cad139b40197cefd6650e8afc49b2.tar.xz
shiboken-36376eb1c97cad139b40197cefd6650e8afc49b2.zip
Merge remote branch 'hugopl/typediscovery2'
Conflicts: libshiboken/conversions.h
Diffstat (limited to 'libshiboken/conversions.h')
-rw-r--r--libshiboken/conversions.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h
index 3c14df32..f8a006de 100644
--- a/libshiboken/conversions.h
+++ b/libshiboken/conversions.h
@@ -232,7 +232,7 @@ struct ObjectTypeConverter
return 0;
SbkBaseWrapperType* shiboType = reinterpret_cast<SbkBaseWrapperType*>(pyobj->ob_type);
if (shiboType->mi_specialcast)
- return (T*) shiboType->mi_specialcast(pyobj, reinterpret_cast<SbkBaseWrapperType*>(SbkType<T>()));
+ return (T*) shiboType->mi_specialcast(SbkBaseWrapper_cptr(pyobj), reinterpret_cast<SbkBaseWrapperType*>(SbkType<T>()));
return (T*) SbkBaseWrapper_cptr(pyobj);
}
};