jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Applied patch #3171793 to fix -fvirtual. Mostly disabled python_abstractbase, since builtin types can't inherit from pure-python ABC's. Duck typing still works.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/szager-python-builtin@12426 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Stefan Zager 2011-02-03 18:10:39 +00:00
commit cd93c7362e
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Examples/test-suite/python/python_abstractbase_runme3.py
View file

@ -1,8 +1,9 @@
from python_abstractbase import * from python_abstractbase import *
from collections import * from collections import *
assert issubclass(Mapii, MutableMapping) # Builtin types can't inherit from pure-python abstract bases
assert issubclass(Multimapii, MutableMapping) #assert issubclass(Mapii, MutableMapping)
assert issubclass(IntSet, MutableSet) #assert issubclass(Multimapii, MutableMapping)
assert issubclass(IntMultiset, MutableSet) #assert issubclass(IntSet, MutableSet)
assert issubclass(IntVector, MutableSequence) #assert issubclass(IntMultiset, MutableSet)
assert issubclass(IntList, MutableSequence) #assert issubclass(IntVector, MutableSequence)
#assert issubclass(IntList, MutableSequence)

2
Source/Modules/allocate.cxx
View file

@ -216,7 +216,7 @@ class Allocate:public Dispatcher {
if (!most_base_covariant_type) { if (!most_base_covariant_type) {
// Eliminate the derived virtual method. // Eliminate the derived virtual method.
if (virtual_elimination_mode) if (virtual_elimination_mode && !this_wrapping_protected_members)
if (both_have_public_access) if (both_have_public_access)
if (!is_non_public_base(inclass, b)) if (!is_non_public_base(inclass, b))
if (!Swig_symbol_isoverloaded(n)) { if (!Swig_symbol_isoverloaded(n)) {