[Swig-cvs] SWIG/Lib/typemaps strings.swg,1.19,1.20 swigtype.swg,1.29,1.30 void.swg,1.13,1.14

[Marcelo M. <mar...@us...>]

Update of /cvsroot/swig/SWIG/Lib/typemaps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7003/Lib/typemaps

Modified Files:
	strings.swg swigtype.swg void.swg 
Log Message:
remove noblock=1 in the varin typemaps since Tcl could add some code before the variable declarations

Index: void.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/void.swg,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** void.swg	9 Jan 2006 19:12:51 -0000	1.13
--- void.swg	20 Jan 2006 00:59:29 -0000	1.14
***************
*** 33,37 ****
  /* varin */
  
! %typemap(varin,noblock=1) void * {
    void *temp = 0;
    int res = SWIG_ConvertPtr($input, &temp, 0, SWIG_POINTER_DISOWN);
--- 33,37 ----
  /* varin */
  
! %typemap(varin) void * {
    void *temp = 0;
    int res = SWIG_ConvertPtr($input, &temp, 0, SWIG_POINTER_DISOWN);

Index: swigtype.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/swigtype.swg,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** swigtype.swg	14 Jan 2006 21:20:52 -0000	1.29
--- swigtype.swg	20 Jan 2006 00:59:29 -0000	1.30
***************
*** 143,147 ****
  }
  
! %typemap(varin,noblock=1) SWIGTYPE [ANY] {
    $basetype *inp = 0;
    int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags);
--- 143,147 ----
  }
  
! %typemap(varin) SWIGTYPE [ANY] {
    $basetype *inp = 0;
    int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags);
***************
*** 191,195 ****
  }
  
! %typemap(varin,noblock=1) SWIGTYPE [ANY][ANY] {
    $basetype (*inp)[$dim1] = 0;
    int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags);
--- 191,195 ----
  }
  
! %typemap(varin) SWIGTYPE [ANY][ANY] {
    $basetype (*inp)[$dim1] = 0;
    int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags);
***************
*** 213,217 ****
  /* Pointers, references, and variable size arrays */
  
! %typemap(varin,noblock=1,warning=SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG) SWIGTYPE * {
    void *argp = 0;
    int res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);  
--- 213,217 ----
  /* Pointers, references, and variable size arrays */
  
! %typemap(varin,warning=SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG) SWIGTYPE * {
    void *argp = 0;
    int res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);  
***************
*** 227,231 ****
  }
  
! %typemap(varin,noblock=1,warning=SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG) SWIGTYPE & {
    void *argp = 0;
    int res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);
--- 227,231 ----
  }
  
! %typemap(varin,warning=SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG) SWIGTYPE & {
    void *argp = 0;
    int res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);
***************
*** 240,244 ****
  
  #if defined(__cplusplus) && defined(%implicitconv_flag)
! %typemap(varin,noblock=1,implicitconv=1) SWIGTYPE {
    void *argp = 0;
    int res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags | %implicitconv_flag);
--- 240,244 ----
  
  #if defined(__cplusplus) && defined(%implicitconv_flag)
! %typemap(varin,implicitconv=1) SWIGTYPE {
    void *argp = 0;
    int res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags | %implicitconv_flag);
***************
*** 256,260 ****
  }
  #else
! %typemap(varin,noblock=1) SWIGTYPE {
    void *argp = 0;
    int res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags);
--- 256,260 ----
  }
  #else
! %typemap(varin) SWIGTYPE {
    void *argp = 0;
    int res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags);
***************
*** 571,575 ****
  }
  
! %typemap(varin,noblock=1) SWIGTYPE *DISOWN {
    void *temp = 0;
    int res = SWIG_ConvertPtr($input, &temp, $descriptor, SWIG_POINTER_DISOWN | %convertptr_flags);
--- 571,575 ----
  }
  
! %typemap(varin) SWIGTYPE *DISOWN {
    void *temp = 0;
    int res = SWIG_ConvertPtr($input, &temp, $descriptor, SWIG_POINTER_DISOWN | %convertptr_flags);

Index: strings.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/strings.swg,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** strings.swg	19 Jan 2006 07:55:48 -0000	1.19
--- strings.swg	20 Jan 2006 00:59:29 -0000	1.20
***************
*** 70,74 ****
  /* varin */
  
! %typemap(varin,noblock=1,fragment=#SWIG_AsCharPtrAndSize) Char * {
    Char *cptr = 0; size_t csize = 0; int alloc = SWIG_NEWOBJ;
    int res = SWIG_AsCharPtrAndSize($input, &cptr, &csize, &alloc);
--- 70,74 ----
  /* varin */
  
! %typemap(varin,fragment=#SWIG_AsCharPtrAndSize) Char * {
    Char *cptr = 0; size_t csize = 0; int alloc = SWIG_NEWOBJ;
    int res = SWIG_AsCharPtrAndSize($input, &cptr, &csize, &alloc);
***************
*** 84,88 ****
  }
  
! %typemap(varin,noblock=1,fragment=#SWIG_AsCharPtrAndSize,warning=SWIGWARN_TYPEMAP_CHARLEAK_MSG) const Char * {
    Char *cptr = 0; size_t csize = 0; int alloc = SWIG_NEWOBJ;
    int res = SWIG_AsCharPtrAndSize($input, &cptr, &csize, &alloc);
--- 84,88 ----
  }
  
! %typemap(varin,fragment=#SWIG_AsCharPtrAndSize,warning=SWIGWARN_TYPEMAP_CHARLEAK_MSG) const Char * {
    Char *cptr = 0; size_t csize = 0; int alloc = SWIG_NEWOBJ;
    int res = SWIG_AsCharPtrAndSize($input, &cptr, &csize, &alloc);
***************
*** 290,294 ****
  /* varin */
  
! %typemap(varin,noblock=1,fragment=#SWIG_AsCharArray) Char [ANY]
  {
    int res = SWIG_AsCharArray($input, $1, $1_dim0);
--- 290,294 ----
  /* varin */
  
! %typemap(varin,fragment=#SWIG_AsCharArray) Char [ANY]
  {
    int res = SWIG_AsCharArray($input, $1, $1_dim0);