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

Fix smart pointer wrappers. The virtual/override/new keyword is not generated for each method as the smart pointer class does not mirror the underlying pointer class inheritance hierarchy. SF #1496535

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9475 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2006-10-24 20:29:27 +00:00
commit 016db92c82
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/Modules/csharp.cxx
View file

@ -1921,12 +1921,15 @@ class CSHARP : public Language {
} else { } else {
methodmods = (!is_public(n) ? protected_string : public_string); methodmods = (!is_public(n) ? protected_string : public_string);
Printf(function_code, " %s ", methodmods); Printf(function_code, " %s ", methodmods);
if (Getattr(n,"override")) if (!is_smart_pointer()) {
Printf(function_code, "override "); // Smart pointer classes do not mirror the inheritance hierarchy of the underlying pointer type, so no virtual/override/new required.
else if (checkAttribute(n, "storage", "virtual")) if (Getattr(n,"override"))
Printf(function_code, "virtual "); Printf(function_code, "override ");
if (Getattr(n, "hides")) else if (checkAttribute(n, "storage", "virtual"))
Printf(function_code, "new "); Printf(function_code, "virtual ");
if (Getattr(n, "hides"))
Printf(function_code, "new ");
}
} }
if (static_flag) if (static_flag)
Printf(function_code, "static "); Printf(function_code, "static ");