diff options
| author | Joel Andersson <j.a.e.andersson@gmail.com> | 2016-11-09 08:27:00 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-09 08:27:00 -0600 |
| commit | 282170e41066ae81723391af5c52b28479671b46 (patch) | |
| tree | 408ecf80cdbcb865d05e3eb1b8dd38bd253277cf | |
| parent | 989d8d6a49cdbfe14e65d6179ef9c43bf14cacf2 (diff) | |
| parent | 9c7240fbc399ef85719c4878138b0ed46c055404 (diff) | |
| download | swig-282170e41066ae81723391af5c52b28479671b46.tar.gz | |
Merge pull request #77 from Alzathar/matlab-unused-parameter
Matlab unused parameter
| -rw-r--r-- | Lib/matlab/matlabrun.swg | 4 | ||||
| -rw-r--r-- | Source/Modules/matlab.cxx | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/Lib/matlab/matlabrun.swg b/Lib/matlab/matlabrun.swg index 553e5fb0c..886853480 100644 --- a/Lib/matlab/matlabrun.swg +++ b/Lib/matlab/matlabrun.swg @@ -171,7 +171,7 @@ SWIG_Matlab_CallInterpEx(int nlhs, mxArray *plhs[], int nrhs, /* Convert a packed value value */ SWIGRUNTIME int -SWIG_Matlab_ConvertPacked(mxArray* pm, void *ptr, size_t sz, swig_type_info *ty) { +SWIG_Matlab_ConvertPacked(mxArray* /*pm*/, void* /*ptr*/, size_t /*sz*/, swig_type_info* /*ty*/) { mexErrMsgIdAndTxt("SWIG:ConvertPacked","Not implemented"); return SWIG_ERROR; } @@ -221,7 +221,7 @@ SWIGRUNTIME mxArray* SWIG_Matlab_NewPointerObj(void *ptr, swig_type_info *type, /* Create a new packed object */ SWIGRUNTIMEINLINE mxArray* -SWIG_Matlab_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) { +SWIG_Matlab_NewPackedObj(void* /*ptr*/, size_t /*sz*/, swig_type_info* /*type*/) { mexErrMsgIdAndTxt("SWIG:NewPackedOb","Not implemented"); return 0; } diff --git a/Source/Modules/matlab.cxx b/Source/Modules/matlab.cxx index 5a7889e99..06bd0fcba 100644 --- a/Source/Modules/matlab.cxx +++ b/Source/Modules/matlab.cxx @@ -593,7 +593,7 @@ int MATLAB::top(Node *n) { Printf(f_begin,"}\n\n"); // Touch module - Printf(f_begin,"int swigTouch(int resc, mxArray *resv[], int argc, mxArray *argv[]) {\n"); + Printf(f_begin,"int swigTouch(int resc, mxArray** /*resv*/, int argc, mxArray** /*argv*/) {\n"); // Make sure no inputs or outputs Printf(f_begin," if (argc!=0 || resc!=0) {\n"); @@ -919,7 +919,10 @@ int MATLAB::functionWrapper(Node *n) { Printf(f->code, "if (!SWIG_check_num_args(\"%s\",argc,%i,%i,%i)) " "{\n SWIG_fail;\n }\n", iname, num_arguments, num_required, varargs); - if (constructor && num_arguments == 1 && num_required == 1) { + if (num_arguments == 0 && num_required == 0) { + Printf(f->code, "(void)argv; // Unused variable\n"); + } + else if (constructor && num_arguments == 1 && num_required == 1) { if (Cmp(storage, "explicit") == 0) { Node *parent = Swig_methodclass(n); if (GetFlag(parent, "feature:implicitconv")) { @@ -2314,7 +2317,7 @@ void MATLAB::finalizeGateway() { void MATLAB::initConstant() { if (CPlusPlus) Printf(f_constants,"extern \"C\"\n"); - Printf(f_constants,"int swigConstant(int resc, mxArray *resv[], int argc, mxArray *argv[]) {\n"); + Printf(f_constants,"int swigConstant(int /*resc*/, mxArray *resv[], int argc, mxArray *argv[]) {\n"); // The first argument is always the ID Printf(f_constants," if (--argc < 0 || !mxIsDouble(*argv) || mxGetNumberOfElements(*argv)!=1) {\n"); @@ -2344,6 +2347,9 @@ void MATLAB::finalizeConstant() { Printf(f_constants," SWIG_Error(SWIG_RuntimeError, \"No such constant.\");\n"); Printf(f_constants," return 1;\n"); Printf(f_constants," }\n"); + if (num_constant == 0) { + Printf(f_constants," (void)resv; // Unused variable\n"); + } Printf(f_constants," return 0;\n"); Printf(f_constants,"}\n"); } |