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

Apply patch #3171793 from szager - protected director methods failing when -fvirtual is used.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12458 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2011-02-13 16:33:12 +00:00
commit fb6f48dda4
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.current
View file

@ -6,7 +6,10 @@ Version 2.0.2 (in progress)
=========================== ===========================
2011-02-13: wsfulton 2011-02-13: wsfulton
Fix #1927852 #include directives don't preprocess the file passed to it. The fix is for Apply patch #3171793 from szager - protected director methods failing when -fvirtual is used.
2011-02-13: wsfulton
Fix #1927852 - #include directives don't preprocess the file passed to it. The fix is for
#include with -importall or -includeall, %include and %import, for example: #include with -importall or -includeall, %include and %import, for example:
#define FILENAME "abc.h" #define FILENAME "abc.h"
%include FILENAME %include FILENAME

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 && !is_member_director(n))
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)) {