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

Marcelo's patch which fixes virtual:type attribute always being set.

Browse source 
Removes incorrect warnings about covariant return types in Java and C#.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5597 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2003-12-28 21:06:02 +00:00
commit bda422a29c
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Source/Modules/allocate.cxx
View file

@ -99,19 +99,23 @@ class Allocate : public Dispatcher {
(!Strcmp(local_type, base_type)
|| SwigType_issubtype(local_type, base_type)) &&
(!Strcmp(local_decl, base_decl)) ) {
// Indicate a virtual method in the derived class, that is, not the virtual method definition in a base class
Setattr(c, "storage", "virtual");
Setattr(c, "virtual:derived", "1");
// record the virtual base type in case some language needs it
Setattr(c, "virtual:type", Getattr(temp, "type"));
if (virtual_elimination_mode && !Strcmp(local_type, base_type))
Setattr(c, "feature:ignore", "1");
Delete(base_decl);
Delete(base_type);
Delete(local_decl);
Delete(local_type);
return 1;
// Indicate a virtual method in the derived class, that
// is, not the virtual method definition in a base class
Setattr(c, "storage", "virtual");
Setattr(c, "virtual:derived", "1");
// record the virtual base type in case some language
// needs it
if (Strcmp(local_type, base_type) == 0) {
if (virtual_elimination_mode) Setattr(c,"feature:ignore", "1");
} else {
Setattr(c, "virtual:type", Getattr(temp, "type"));
}
Delete(base_decl);
Delete(base_type);
Delete(local_decl);
Delete(local_type);
return 1;
}
Delete(base_decl);
Delete(base_type);