extra check to see if the template deftype is needed
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8300 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
6eff5b03dd
commit
f83bb5488d
1 changed files with 4 additions and 2 deletions
|
|
@ -1876,7 +1876,7 @@ SwigType_emit_type_table(File *f_forward, File *f_table) {
|
||||||
/* we save the original type and the fully resolved version */
|
/* we save the original type and the fully resolved version */
|
||||||
ln = SwigType_lstr(lt,0);
|
ln = SwigType_lstr(lt,0);
|
||||||
rn = SwigType_lstr(rt,0);
|
rn = SwigType_lstr(rt,0);
|
||||||
if (Strcmp(ln,rn) == 0) {
|
if (Equal(ln,rn)) {
|
||||||
nt = NewString(ln);
|
nt = NewString(ln);
|
||||||
} else {
|
} else {
|
||||||
nt = NewStringf("%s|%s", rn, ln);
|
nt = NewStringf("%s|%s", rn, ln);
|
||||||
|
|
@ -1884,7 +1884,9 @@ SwigType_emit_type_table(File *f_forward, File *f_table) {
|
||||||
if (SwigType_istemplate(rt)) {
|
if (SwigType_istemplate(rt)) {
|
||||||
String *dt = Swig_symbol_template_deftype(rt, 0);
|
String *dt = Swig_symbol_template_deftype(rt, 0);
|
||||||
String *dn = SwigType_lstr(dt,0);
|
String *dn = SwigType_lstr(dt,0);
|
||||||
Printf(nt,"|%s",dn);
|
if (!Equal(dn,rn) || !Equal(dn,ln)) {
|
||||||
|
Printf(nt,"|%s",dn);
|
||||||
|
}
|
||||||
Delete(dt);
|
Delete(dt);
|
||||||
Delete(dn);
|
Delete(dn);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue