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

Don't force inheritance of ignored methods

Browse source 
If a symbol is ignored in the base class, it shouldn't appear in the derived
class neither.
This commit is contained in:
Vadim Zeitlin 2016-04-26 16:07:06 +02:00
commit 65d9cad1ca
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Modules/c.cxx
View file

@ -1303,8 +1303,8 @@ ready:
|| (Cmp(Getattr(node, "kind"), "function") == 0)) { || (Cmp(Getattr(node, "kind"), "function") == 0)) {
if ((Cmp(Getattr(node, "access"), "public") == 0) if ((Cmp(Getattr(node, "access"), "public") == 0)
&& (Cmp(Getattr(node, "storage"), "static") != 0)) { && (Cmp(Getattr(node, "storage"), "static") != 0)) {
// Assignment operators are not inherited in C++. // Assignment operators are not inherited in C++ and symbols without sym:name should be ignored, not copied into the derived class.
if (Cmp(Getattr(node, "name"), "operator =") != 0) { if (Getattr(node, "sym:name") && Cmp(Getattr(node, "name"), "operator =") != 0) {
Node *new_node = copy_node(node); Node *new_node = copy_node(node);
String *parent_name = Getattr(parentNode(node), "name"); String *parent_name = Getattr(parentNode(node), "name");
Hash *dupl_name_node = is_in(Getattr(node, "name"), n); Hash *dupl_name_node = is_in(Getattr(node, "name"), n);