fix for templates to avoid using the templatereduce mode
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7961 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
b5fc607731
commit
fdf4d72b4b
5 changed files with 24 additions and 4 deletions
|
|
@ -375,6 +375,7 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *ts
|
|||
String *name, *value, *valuestr, *tydef, *tmp, *tmpr;
|
||||
int sz, i;
|
||||
String *dvalue = 0;
|
||||
String *qvalue = 0;
|
||||
|
||||
name = Getattr(tp,k_name);
|
||||
value = Getattr(p,k_value);
|
||||
|
|
@ -382,7 +383,8 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *ts
|
|||
|
||||
if (name) {
|
||||
if (!value) value = Getattr(p,k_type);
|
||||
dvalue = Swig_symbol_type_qualify(value,tsdecl);
|
||||
qvalue = Swig_symbol_type_qualify(value,tsdecl);
|
||||
dvalue = Swig_symbol_typedef_reduce(qvalue, tsdecl);
|
||||
if (SwigType_istemplate(dvalue)) {
|
||||
String *ty = Swig_symbol_template_deftype(dvalue, tscope);
|
||||
Delete(dvalue);
|
||||
|
|
@ -434,6 +436,7 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *ts
|
|||
Delete(tmpr);
|
||||
Delete(valuestr);
|
||||
Delete(dvalue);
|
||||
Delete(qvalue);
|
||||
}
|
||||
p = nextSibling(p);
|
||||
tp = nextSibling(tp);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue