From a551f26811cbafd4649d376feee9ad442be63d4d Mon Sep 17 00:00:00 2001
From: Marcelo Matus <mmatus@acms.arizona.edu>
Date: Fri, 20 Jan 2006 00:59:29 +0000
Subject: [PATCH] remove noblock=1 in the varin typemaps since Tcl could add
 some code before the variable declarations

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8490 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 SWIG/Lib/typemaps/strings.swg  |  6 +++---
 SWIG/Lib/typemaps/swigtype.swg | 14 +++++++-------
 SWIG/Lib/typemaps/void.swg     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/SWIG/Lib/typemaps/strings.swg b/SWIG/Lib/typemaps/strings.swg
index ae0b31d85..8664de901 100644
--- a/SWIG/Lib/typemaps/strings.swg
+++ b/SWIG/Lib/typemaps/strings.swg
@@ -69,7 +69,7 @@
 
 /* varin */
 
-%typemap(varin,noblock=1,fragment=#SWIG_AsCharPtrAndSize) Char * {
+%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);
   if (!SWIG_IsOK(res)) {
@@ -83,7 +83,7 @@
   }
 }
 
-%typemap(varin,noblock=1,fragment=#SWIG_AsCharPtrAndSize,warning=SWIGWARN_TYPEMAP_CHARLEAK_MSG) const Char * {
+%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);
   if (!SWIG_IsOK(res)) {
@@ -289,7 +289,7 @@
 
 /* varin */
 
-%typemap(varin,noblock=1,fragment=#SWIG_AsCharArray) Char [ANY]
+%typemap(varin,fragment=#SWIG_AsCharArray) Char [ANY]
 {
   int res = SWIG_AsCharArray($input, $1, $1_dim0);
   if (!SWIG_IsOK(res)) {
diff --git a/SWIG/Lib/typemaps/swigtype.swg b/SWIG/Lib/typemaps/swigtype.swg
index e911b26a5..6398c3fde 100644
--- a/SWIG/Lib/typemaps/swigtype.swg
+++ b/SWIG/Lib/typemaps/swigtype.swg
@@ -142,7 +142,7 @@
   }
 }
 
-%typemap(varin,noblock=1) SWIGTYPE [ANY] {
+%typemap(varin) SWIGTYPE [ANY] {
   $basetype *inp = 0;
   int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags);
   if (!SWIG_IsOK(res)) {
@@ -190,7 +190,7 @@
   }
 }
 
-%typemap(varin,noblock=1) SWIGTYPE [ANY][ANY] {
+%typemap(varin) SWIGTYPE [ANY][ANY] {
   $basetype (*inp)[$dim1] = 0;
   int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags);
   if (!SWIG_IsOK(res)) {
@@ -212,7 +212,7 @@
 
 /* Pointers, references, and variable size arrays */
 
-%typemap(varin,noblock=1,warning=SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG) SWIGTYPE * {
+%typemap(varin,warning=SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG) SWIGTYPE * {
   void *argp = 0;
   int res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);  
   if (!SWIG_IsOK(res)) {
@@ -226,7 +226,7 @@
   %variable_fail(SWIG_AttributeError, "$type", "read-only $name");
 }
 
-%typemap(varin,noblock=1,warning=SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG) SWIGTYPE & {
+%typemap(varin,warning=SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG) SWIGTYPE & {
   void *argp = 0;
   int res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);
   if (!SWIG_IsOK(res)) {
@@ -239,7 +239,7 @@
 }
 
 #if defined(__cplusplus) && defined(%implicitconv_flag)
-%typemap(varin,noblock=1,implicitconv=1) SWIGTYPE {
+%typemap(varin,implicitconv=1) SWIGTYPE {
   void *argp = 0;
   int res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags | %implicitconv_flag);
   if (!SWIG_IsOK(res)) {
@@ -255,7 +255,7 @@
   }
 }
 #else
-%typemap(varin,noblock=1) SWIGTYPE {
+%typemap(varin) SWIGTYPE {
   void *argp = 0;
   int res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags);
   if (!SWIG_IsOK(res)) {
@@ -570,7 +570,7 @@
   }
 }
 
-%typemap(varin,noblock=1) SWIGTYPE *DISOWN {
+%typemap(varin) SWIGTYPE *DISOWN {
   void *temp = 0;
   int res = SWIG_ConvertPtr($input, &temp, $descriptor, SWIG_POINTER_DISOWN | %convertptr_flags);
   if (!SWIG_IsOK(res)) {
diff --git a/SWIG/Lib/typemaps/void.swg b/SWIG/Lib/typemaps/void.swg
index 2eb89e8ff..931a784d9 100644
--- a/SWIG/Lib/typemaps/void.swg
+++ b/SWIG/Lib/typemaps/void.swg
@@ -32,7 +32,7 @@
 
 /* varin */
 
-%typemap(varin,noblock=1) void * {
+%typemap(varin) void * {
   void *temp = 0;
   int res = SWIG_ConvertPtr($input, &temp, 0, SWIG_POINTER_DISOWN);
   if (!SWIG_IsOK(res)) {