summaryrefslogtreecommitdiffstats
path: root/libshiboken/conversions.h
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2010-03-04 16:34:45 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2010-03-04 17:13:40 -0300
commitf4db0c74e0f267c102fff6eb47ecc3eae628a637 (patch)
treee988b735d382f9d814078a9fba2009f9d6a38a39 /libshiboken/conversions.h
parentdbeca960863dadbe8d496195bc60202619314214 (diff)
parentedc9cbfcfde439ccfe7100f53efc5d1e4ec34480 (diff)
downloadshiboken-f4db0c74e0f267c102fff6eb47ecc3eae628a637.tar.gz
shiboken-f4db0c74e0f267c102fff6eb47ecc3eae628a637.tar.xz
shiboken-f4db0c74e0f267c102fff6eb47ecc3eae628a637.zip
Merge branch 'master' into extensibleconversions
Conflicts: cppgenerator.cpp libshiboken/basewrapper.cpp Reviewed by Hugo Parente <hugo.lima@openbossa.org> Reviewed by Lauro Moura <lauro.neto@openbossa.org>
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 48f28048..e40ebf2f 100644
--- a/libshiboken/conversions.h
+++ b/libshiboken/conversions.h
@@ -252,7 +252,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);
}
};