diff options
author | Matti Airas <matti.p.airas@nokia.com> | 2010-03-17 17:09:15 -0300 |
---|---|---|
committer | Matti Airas <matti.p.airas@nokia.com> | 2010-03-17 17:09:15 -0300 |
commit | 21bcdc289ba9ece35780369a5e86a68498a6ddae (patch) | |
tree | ad2a151f4f810eb8a6e8fc96acb994b3e202cae4 /tests/libother | |
parent | f9b62c6a5b3f7232bb00a5ab39fd8037fc9c7d81 (diff) | |
download | shiboken-21bcdc289ba9ece35780369a5e86a68498a6ddae.tar.gz shiboken-21bcdc289ba9ece35780369a5e86a68498a6ddae.tar.xz shiboken-21bcdc289ba9ece35780369a5e86a68498a6ddae.zip |
added support for pure virtual methods returning void ptrs
the return statements now have correct values for pure virtual methods
returning void pointers. also added a dummy test for this (can't really
test it properly until the semantics of casting the python return value
into a void pointer is properly defined -- if ever).
Diffstat (limited to 'tests/libother')
-rw-r--r-- | tests/libother/otherderived.cpp | 6 | ||||
-rw-r--r-- | tests/libother/otherderived.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/libother/otherderived.cpp b/tests/libother/otherderived.cpp index 10529ee2..5659fe0c 100644 --- a/tests/libother/otherderived.cpp +++ b/tests/libother/otherderived.cpp @@ -54,6 +54,12 @@ OtherDerived::pureVirtual() { } +void* +OtherDerived::pureVirtualReturningVoidPtr() +{ + return 0; +} + void OtherDerived::unpureVirtual() { diff --git a/tests/libother/otherderived.h b/tests/libother/otherderived.h index ff425da5..4aae12aa 100644 --- a/tests/libother/otherderived.h +++ b/tests/libother/otherderived.h @@ -49,6 +49,7 @@ public: OtherDerived(int id = -1); virtual ~OtherDerived(); virtual void pureVirtual(); + virtual void* pureVirtualReturningVoidPtr(); virtual void unpureVirtual(); virtual PrintFormat returnAnEnum() { return Short; } |