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

Simplify and inline functionWrapperAddCPPResult()

Browse source 
This function seemed to be doing a few unnecessary things, e.g. it resolved
the typedefs which doesn't seem to be necessary and the test for member
pointer seems to be useless too.

Just add a local "cppresult" directly in the caller instead of using a
separate function to do all this.
This commit is contained in:
Vadim Zeitlin 2016-04-23 02:34:52 +02:00
commit 0c936d9089
1 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/Modules/c.cxx
View file

@ -740,20 +740,6 @@ ready:
Delete(over_suffix);
}
static void functionWrapperAddCPPResult(Wrapper *wrapper, const SwigType *type, const String *tm)
{
SwigType *cpptype;
SwigType *tdtype = SwigType_typedef_resolve_all(tm);
if (tdtype)
cpptype = tdtype;
else
cpptype = (SwigType*)tm;
if (SwigType_ismemberpointer(type))
Wrapper_add_local(wrapper, "cppresult", SwigType_str(type, "cppresult"));
else
Wrapper_add_local(wrapper, "cppresult", SwigType_str(cpptype, "cppresult"));
}
String *get_wrapper_func_return_type(output_target target, Node *n)
{
SwigType *type = Getattr(n, "type");
@ -932,9 +918,8 @@ ready:
// add variable for holding result of original function 'cppresult'
if (!is_void_return && !is_ctor) {
String *tm;
if ((tm = Swig_typemap_lookup("cppouttype", n, "", 0))) {
functionWrapperAddCPPResult(wrapper, type, tm);
if (String *tm = Swig_typemap_lookup("cppouttype", n, "", 0)) {
Wrapper_add_local(wrapper, "cppresult", SwigType_str(tm, "cppresult"));
return_object = checkAttribute(n, "tmap:cppouttype:retobj", "1");
}
else {