Oops, missing 'else' in the old SwigValueWrapper mechanism
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6469 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
79bec67051
commit
5630e78234
1 changed files with 6 additions and 5 deletions
|
|
@ -1247,20 +1247,21 @@ SwigType *SwigType_alttype(SwigType *t, int local_tmap) {
|
||||||
SwigType *ftd = SwigType_typedef_resolve_all(t);
|
SwigType *ftd = SwigType_typedef_resolve_all(t);
|
||||||
SwigType *td = SwigType_strip_qualifiers(ftd);
|
SwigType *td = SwigType_strip_qualifiers(ftd);
|
||||||
Delete(ftd);
|
Delete(ftd);
|
||||||
if ((n = Swig_symbol_clookup(td,0)) && !Getattr(n,"feature:novaluewrapper")) {
|
if ((n = Swig_symbol_clookup(td,0))) {
|
||||||
if (Getattr(n,"feature:valuewrapper")) {
|
if (Getattr(n,"feature:valuewrapper")) {
|
||||||
use_wrapper = 1;
|
use_wrapper = 1;
|
||||||
} else {
|
} else {
|
||||||
if ((Strcmp(nodeType(n),"class") == 0)
|
if ((Strcmp(nodeType(n),"class") == 0)
|
||||||
&& (!Getattr(n,"allocate:default_constructor")
|
&& (!Getattr(n,"allocate:default_constructor")
|
||||||
|| (Getattr(n,"allocate:noassign")))) {
|
|| (Getattr(n,"allocate:noassign")))) {
|
||||||
use_wrapper = 1;
|
use_wrapper = !Getattr(n,"feature:novaluewrapper");
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
if (SwigType_issimple(td) && SwigType_istemplate(td)) {
|
if (SwigType_issimple(td) && SwigType_istemplate(td)) {
|
||||||
use_wrapper = 1;
|
use_wrapper = 1;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
Delete(td);
|
Delete(td);
|
||||||
}
|
}
|
||||||
return (use_wrapper ? NewStringf("SwigValueWrapper< %s >",SwigType_str(t,0)): 0);
|
return (use_wrapper ? NewStringf("SwigValueWrapper< %s >",SwigType_str(t,0)): 0);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue