jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move setting parameter/return type inside do_resolve_type()

Browse source 
No real changes, this just prepares for more changes later.
This commit is contained in:
Vadim Zeitlin 2021-12-08 02:59:29 +01:00
commit 3d0fe23e29
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/Modules/c.cxx
View file

@ -494,8 +494,7 @@ struct cxx_wrappers
return false;
}
rtype_desc.set_type(type);
if (!do_resolve_type(n, func_type, rtype_desc.type(), NULL, &rtype_desc))
if (!do_resolve_type(n, func_type, type, NULL, &rtype_desc))
return false;
if (use_cxxout) {
@ -527,8 +526,7 @@ struct cxx_wrappers
return false;
}
ptype_desc.set_type(type);
if (!do_resolve_type(n, Getattr(p, "type"), ptype_desc.type(), &ptype_desc, NULL))
if (!do_resolve_type(n, Getattr(p, "type"), type, &ptype_desc, NULL))
return false;
if (use_cxxin) {
@ -629,6 +627,12 @@ private:
return false;
}
// Nothing else needed.
if (rtype_desc)
rtype_desc->set_type(s);
if (ptype_desc)
ptype_desc->set_type(s);
return true;
}
@ -800,6 +804,11 @@ private:
Replaceall(s, typemaps[typeKind], typestr);
if (rtype_desc)
rtype_desc->set_type(s);
if (ptype_desc)
ptype_desc->set_type(s);
return true;
}