old extra fix for valuewrapper
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6832 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
d88eed76e6
commit
e4cdbbfaef
1 changed files with 4 additions and 4 deletions
|
|
@ -1261,6 +1261,7 @@ SwigType *SwigType_alttype(SwigType *t, int local_tmap) {
|
||||||
if (value_wrapper_mode == 0) {
|
if (value_wrapper_mode == 0) {
|
||||||
/* old partial use of SwigValueTypes, it can fail for opaque types */
|
/* old partial use of SwigValueTypes, it can fail for opaque types */
|
||||||
Node *n;
|
Node *n;
|
||||||
|
SwigType *w = 0;
|
||||||
int use_wrapper = 0;
|
int use_wrapper = 0;
|
||||||
if (local_tmap) return 0;
|
if (local_tmap) return 0;
|
||||||
if (!use_wrapper && SwigType_isclass(t)) {
|
if (!use_wrapper && SwigType_isclass(t)) {
|
||||||
|
|
@ -1283,9 +1284,10 @@ SwigType *SwigType_alttype(SwigType *t, int local_tmap) {
|
||||||
use_wrapper = 1;
|
use_wrapper = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (use_wrapper) w = NewStringf("SwigValueWrapper<%s >",SwigType_str(td,0));
|
||||||
Delete(td);
|
Delete(td);
|
||||||
}
|
}
|
||||||
return (use_wrapper ? NewStringf("SwigValueWrapper< %s >",SwigType_str(t,0)): 0);
|
return w;
|
||||||
} else {
|
} else {
|
||||||
/* safe use of SwigValueTypes, it can fail with some typemaps */
|
/* safe use of SwigValueTypes, it can fail with some typemaps */
|
||||||
SwigType *w = 0;
|
SwigType *w = 0;
|
||||||
|
|
@ -1306,9 +1308,7 @@ SwigType *SwigType_alttype(SwigType *t, int local_tmap) {
|
||||||
use_wrapper = 0;
|
use_wrapper = 0;
|
||||||
}
|
}
|
||||||
if (use_wrapper) {
|
if (use_wrapper) {
|
||||||
String *name = SwigType_str(t,0);
|
w = NewStringf("SwigValueWrapper<%s >",td);
|
||||||
w = NewStringf("SwigValueWrapper<%s >",name);
|
|
||||||
Delete(name);
|
|
||||||
}
|
}
|
||||||
Delete(ftd);
|
Delete(ftd);
|
||||||
Delete(td);
|
Delete(td);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue