fix compiler warnings and finishing transition to the option
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7727 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
1fa14f74a7
commit
520148071b
1 changed files with 11 additions and 6 deletions
|
|
@ -936,8 +936,10 @@ public:
|
||||||
/* Are we tracking the type that is being returned
|
/* Are we tracking the type that is being returned
|
||||||
* by this output parameter? */
|
* by this output parameter? */
|
||||||
SwigType *pt = Getattr(p,"type");
|
SwigType *pt = Getattr(p,"type");
|
||||||
if (pt && trackType(pt)) {
|
if (trackType(pt)) {
|
||||||
setTrackObjectsFlagForNewPointer(tm);
|
Replaceall(tm, "$track","SWIG_TRACK_OBJECTS");
|
||||||
|
} else {
|
||||||
|
Replaceall(tm, "$track","0");
|
||||||
}
|
}
|
||||||
|
|
||||||
Printv(outarg,tm,"\n",NIL);
|
Printv(outarg,tm,"\n",NIL);
|
||||||
|
|
@ -993,6 +995,7 @@ public:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
/* ---------------------------------------------------------------------
|
/* ---------------------------------------------------------------------
|
||||||
* setTrackObjectsFlagForConvertPtr()
|
* setTrackObjectsFlagForConvertPtr()
|
||||||
*
|
*
|
||||||
|
|
@ -1061,6 +1064,8 @@ public:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------
|
/* ---------------------------------------------------------------------
|
||||||
* functionWrapper()
|
* functionWrapper()
|
||||||
*
|
*
|
||||||
|
|
@ -1159,7 +1164,7 @@ public:
|
||||||
} else {
|
} else {
|
||||||
Printf(f->code,"if (argc < %d) ", numreq-start);
|
Printf(f->code,"if (argc < %d) ", numreq-start);
|
||||||
}
|
}
|
||||||
Printf(f->code,"{rb_raise(rb_eArgError, \"wrong # of arguments(%%d for %d)\",argc); return Qnil;}\n",numreq-start);
|
Printf(f->code,"{rb_raise(rb_eArgError, \"wrong # of arguments(%%d for %d)\",argc); SWIG_fail;}\n",numreq-start);
|
||||||
} else {
|
} else {
|
||||||
Printv(f->def, "SWIGINTERN VALUE\n", wname, "(int argc, VALUE *argv, VALUE self) {", NIL);
|
Printv(f->def, "SWIGINTERN VALUE\n", wname, "(int argc, VALUE *argv, VALUE self) {", NIL);
|
||||||
if (!varargs) {
|
if (!varargs) {
|
||||||
|
|
@ -1167,7 +1172,7 @@ public:
|
||||||
} else {
|
} else {
|
||||||
Printf(f->code,"if (argc < %d) ", numreq-start);
|
Printf(f->code,"if (argc < %d) ", numreq-start);
|
||||||
}
|
}
|
||||||
Printf(f->code,"{rb_raise(rb_eArgError, \"wrong # of arguments(%%d for %d)\",argc); return Qnil;}\n",numreq-start);
|
Printf(f->code,"{rb_raise(rb_eArgError, \"wrong # of arguments(%%d for %d)\",argc); SWIG_fail;}\n",numreq-start);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Now walk the function parameter list and generate code */
|
/* Now walk the function parameter list and generate code */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue