Minor tweak to earlier const-smart-pointer fix.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@4571 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
e4620e28e7
commit
58f7e0808d
1 changed files with 9 additions and 8 deletions
|
|
@ -1032,7 +1032,15 @@ Language::variableHandler(Node *n) {
|
||||||
staticmembervariableHandler(n);
|
staticmembervariableHandler(n);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
Swig_save("variableHandler",n,"feature:immutable",NIL);
|
||||||
|
/* If a smart-pointer and it's a constant access, we have to set immutable */
|
||||||
|
if (SmartPointer) {
|
||||||
|
if (Getattr(CurrentClass,"allocate:smartpointerconst")) {
|
||||||
|
Setattr(n,"feature:immutable","1");
|
||||||
|
}
|
||||||
|
}
|
||||||
membervariableHandler(n);
|
membervariableHandler(n);
|
||||||
|
Swig_restore(n);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return SWIG_OK;
|
return SWIG_OK;
|
||||||
|
|
@ -1058,7 +1066,7 @@ int
|
||||||
Language::membervariableHandler(Node *n) {
|
Language::membervariableHandler(Node *n) {
|
||||||
|
|
||||||
Swig_require("membervariableHandler",n,"*name","*sym:name","*type",NIL);
|
Swig_require("membervariableHandler",n,"*name","*sym:name","*type",NIL);
|
||||||
Swig_save("membervariableHandler",n,"parms","feature:immutable",NIL);
|
Swig_save("membervariableHandler",n,"parms",NIL);
|
||||||
|
|
||||||
String *name = Getattr(n,"name");
|
String *name = Getattr(n,"name");
|
||||||
String *symname = Getattr(n,"sym:name");
|
String *symname = Getattr(n,"sym:name");
|
||||||
|
|
@ -1073,13 +1081,6 @@ Language::membervariableHandler(Node *n) {
|
||||||
Delattr(n,"feature:except");
|
Delattr(n,"feature:except");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If a smart-pointer and it's a constant access, we have to set immutable */
|
|
||||||
if (SmartPointer) {
|
|
||||||
if (Getattr(CurrentClass,"allocate:smartpointerconst")) {
|
|
||||||
Setattr(n,"feature:immutable","1");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!AttributeFunctionGet) {
|
if (!AttributeFunctionGet) {
|
||||||
|
|
||||||
String *mrename_get, *mrename_set;
|
String *mrename_get, *mrename_set;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue