Commit 5d459b4e authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'struct-array-fix'

parents f99797cd 671e9f79
...@@ -363,12 +363,6 @@ static t_scalar *template_conformscalar(t_template *tfrom, t_template *tto, ...@@ -363,12 +363,6 @@ static t_scalar *template_conformscalar(t_template *tfrom, t_template *tto,
} }
else if (ds->ds_type == DT_ARRAY) else if (ds->ds_type == DT_ARRAY)
{ {
t_symbol *arraytemplate = ds->ds_fieldtemplate;
if (arraytemplate == tfrom->t_sym ||
arraytemplate == tto->t_sym)
{
return 0;
}
template_conformarray(tfrom, tto, conformaction, template_conformarray(tfrom, tto, conformaction,
x->sc_vec[i].w_array); x->sc_vec[i].w_array);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment