From: Marcelo M. <mar...@us...> - 2006-01-21 01:03:44
|
Update of /cvsroot/swig/SWIG/Lib/typemaps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12166/Lib/typemaps Modified Files: inoutlist.swg swigtype.swg Log Message: silence warnings with -O1 -Wall Index: inoutlist.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/typemaps/inoutlist.swg,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** inoutlist.swg 9 Jan 2006 19:12:51 -0000 1.12 --- inoutlist.swg 21 Jan 2006 01:03:37 -0000 1.13 *************** *** 78,82 **** %define %_value_input_typemap(code, asval_meth, asval_frag, Type) ! %typemap(in,noblock=1,fragment=asval_frag) Type *INPUT ($*ltype temp, int res) { if (!%check_input_ptr($input,&$1,$descriptor,$disown)) { Type val; --- 78,82 ---- %define %_value_input_typemap(code, asval_meth, asval_frag, Type) ! %typemap(in,noblock=1,fragment=asval_frag) Type *INPUT ($*ltype temp, int res = 0) { if (!%check_input_ptr($input,&$1,$descriptor,$disown)) { Type val; *************** *** 90,94 **** } } ! %typemap(in,noblock=1,fragment=asval_frag) Type &INPUT($*ltype temp, int res) { if (!%check_input_ptr($input,&$1,$descriptor,$disown)) { Type val; --- 90,94 ---- } } ! %typemap(in,noblock=1,fragment=asval_frag) Type &INPUT($*ltype temp, int res = 0) { if (!%check_input_ptr($input,&$1,$descriptor,$disown)) { Type val; *************** *** 116,120 **** %define %_ptr_input_typemap(code,asptr_meth,asptr_frag,Type) ! %typemap(in,noblock=1,fragment=asptr_frag) Type *INPUT(int res) { res = asptr_meth($input, &$1); if (!SWIG_IsOK(res)) { --- 116,120 ---- %define %_ptr_input_typemap(code,asptr_meth,asptr_frag,Type) ! %typemap(in,noblock=1,fragment=asptr_frag) Type *INPUT(int res = 0) { res = asptr_meth($input, &$1); if (!SWIG_IsOK(res)) { *************** *** 123,127 **** res = SWIG_AddTmpMask(res); } ! %typemap(in,noblock=1,fragment=asptr_frag) Type &INPUT(int res) { res = asptr_meth($input, &$1); if (!SWIG_IsOK(res)) { --- 123,127 ---- res = SWIG_AddTmpMask(res); } ! %typemap(in,noblock=1,fragment=asptr_frag) Type &INPUT(int res = 0) { res = asptr_meth($input, &$1); if (!SWIG_IsOK(res)) { Index: swigtype.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/typemaps/swigtype.swg,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** swigtype.swg 20 Jan 2006 00:59:29 -0000 1.30 --- swigtype.swg 21 Jan 2006 01:03:37 -0000 1.31 *************** *** 3,7 **** * ----------------------------------------------------------------------------- */ /* Pointers and arrays */ ! %typemap(in, noblock=1) SWIGTYPE *(void *argp = 0, int res) { res = SWIG_ConvertPtr($input, &argp,$descriptor, $disown | %convertptr_flags); if (!SWIG_IsOK(res)) { --- 3,7 ---- * ----------------------------------------------------------------------------- */ /* Pointers and arrays */ ! %typemap(in, noblock=1) SWIGTYPE *(void *argp = 0, int res = 0) { res = SWIG_ConvertPtr($input, &argp,$descriptor, $disown | %convertptr_flags); if (!SWIG_IsOK(res)) { *************** *** 12,16 **** %typemap(freearg) SWIGTYPE * ""; ! %typemap(in, noblock=1) SWIGTYPE [] (void *argp = 0, int res) { res = SWIG_ConvertPtr($input, &argp,$descriptor, $disown | %convertptr_flags); if (!SWIG_IsOK(res)) { --- 12,16 ---- %typemap(freearg) SWIGTYPE * ""; ! %typemap(in, noblock=1) SWIGTYPE [] (void *argp = 0, int res = 0) { res = SWIG_ConvertPtr($input, &argp,$descriptor, $disown | %convertptr_flags); if (!SWIG_IsOK(res)) { *************** *** 22,26 **** ! %typemap(in, noblock=1) SWIGTYPE* const& (void *argp = 0, int res, $*ltype temp) { res = SWIG_ConvertPtr($input, &argp, $*descriptor, $disown | %convertptr_flags); if (!SWIG_IsOK(res)) { --- 22,26 ---- ! %typemap(in, noblock=1) SWIGTYPE* const& (void *argp = 0, int res = 0, $*ltype temp) { res = SWIG_ConvertPtr($input, &argp, $*descriptor, $disown | %convertptr_flags); if (!SWIG_IsOK(res)) { *************** *** 34,38 **** /* Reference */ ! %typemap(in, noblock=1) SWIGTYPE & (void *argp = 0, int res) { res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags); if (!SWIG_IsOK(res)) { --- 34,38 ---- /* Reference */ ! %typemap(in, noblock=1) SWIGTYPE & (void *argp = 0, int res = 0) { res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags); if (!SWIG_IsOK(res)) { *************** *** 45,49 **** #if defined(__cplusplus) && defined(%implicitconv_flag) ! %typemap(in,implicitconv=1) const SWIGTYPE & (void *argp = 0, int res) { res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags | %implicitconv_flag); if (!SWIG_IsOK(res)) { --- 45,49 ---- #if defined(__cplusplus) && defined(%implicitconv_flag) ! %typemap(in,implicitconv=1) const SWIGTYPE & (void *argp = 0, int res = 0) { res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags | %implicitconv_flag); if (!SWIG_IsOK(res)) { *************** *** 58,62 **** } #else ! %typemap(in,noblock=1) const SWIGTYPE & (void *argp, int res) { res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags); if (!SWIG_IsOK(res)) { --- 58,62 ---- } #else ! %typemap(in,noblock=1) const SWIGTYPE & (void *argp, int res = 0) { res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags); if (!SWIG_IsOK(res)) { *************** *** 355,359 **** /* directorout */ #if defined(__cplusplus) && defined(%implicitconv_flag) ! %typemap(directorout,noblock=1,implicitconv=1) SWIGTYPE (void * argp, int res) { res = SWIG_ConvertPtr($input,&argp,$&descriptor, %convertptr_flags | %implicitconv_flag); if (!SWIG_IsOK(res)) { --- 355,359 ---- /* directorout */ #if defined(__cplusplus) && defined(%implicitconv_flag) ! %typemap(directorout,noblock=1,implicitconv=1) SWIGTYPE (void * argp, int res = 0) { res = SWIG_ConvertPtr($input,&argp,$&descriptor, %convertptr_flags | %implicitconv_flag); if (!SWIG_IsOK(res)) { *************** *** 364,368 **** } #else ! %typemap(directorout,noblock=1) SWIGTYPE (void * argp, int res) { res = SWIG_ConvertPtr($input,&argp,$&descriptor, %convertptr_flags); if (!SWIG_IsOK(res)) { --- 364,368 ---- } #else ! %typemap(directorout,noblock=1) SWIGTYPE (void * argp, int res = 0) { res = SWIG_ConvertPtr($input,&argp,$&descriptor, %convertptr_flags); if (!SWIG_IsOK(res)) { *************** *** 564,568 **** /* DISOWN typemap */ ! %typemap(in, noblock=1) SWIGTYPE *DISOWN (int res) { res = SWIG_ConvertPtr($input, %as_voidptrptr(&$1), $descriptor, SWIG_POINTER_DISOWN | %convertptr_flags); if (!SWIG_IsOK(res)) { --- 564,568 ---- /* DISOWN typemap */ ! %typemap(in, noblock=1) SWIGTYPE *DISOWN (int res = 0) { res = SWIG_ConvertPtr($input, %as_voidptrptr(&$1), $descriptor, SWIG_POINTER_DISOWN | %convertptr_flags); if (!SWIG_IsOK(res)) { |