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.
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:
parent
62fef1bf99
commit
cd93c7362e
2 changed files with 8 additions and 7 deletions
|
|
@ -1,8 +1,9 @@
|
|||
from python_abstractbase import *
|
||||
from collections import *
|
||||
assert issubclass(Mapii, MutableMapping)
|
||||
assert issubclass(Multimapii, MutableMapping)
|
||||
assert issubclass(IntSet, MutableSet)
|
||||
assert issubclass(IntMultiset, MutableSet)
|
||||
assert issubclass(IntVector, MutableSequence)
|
||||
assert issubclass(IntList, MutableSequence)
|
||||
# Builtin types can't inherit from pure-python abstract bases
|
||||
#assert issubclass(Mapii, MutableMapping)
|
||||
#assert issubclass(Multimapii, MutableMapping)
|
||||
#assert issubclass(IntSet, MutableSet)
|
||||
#assert issubclass(IntMultiset, MutableSet)
|
||||
#assert issubclass(IntVector, MutableSequence)
|
||||
#assert issubclass(IntList, MutableSequence)
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ class Allocate:public Dispatcher {
|
|||
|
||||
if (!most_base_covariant_type) {
|
||||
// Eliminate the derived virtual method.
|
||||
if (virtual_elimination_mode)
|
||||
if (virtual_elimination_mode && !this_wrapping_protected_members)
|
||||
if (both_have_public_access)
|
||||
if (!is_non_public_base(inclass, b))
|
||||
if (!Swig_symbol_isoverloaded(n)) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue