diff --git a/SWIG/Lib/python/pyswigtype.swg b/SWIG/Lib/python/pyswigtype.swg
index c79607ec0..53e2c88ec 100644
--- a/SWIG/Lib/python/pyswigtype.swg
+++ b/SWIG/Lib/python/pyswigtype.swg
@@ -82,14 +82,14 @@
 
 %typemap(varin) SWIGTYPE [ANY] {
   void *temp;
-  int ii;
+  size_t ii;
   $1_basetype *b = 0;
   if ((SWIG_ConvertPtr($input, &temp, $1_descriptor, SWIG_POINTER_EXCEPTION)) == -1) {
     PyErr_SetString(PyExc_TypeError, "C/C++ variable '$name ($1_ltype)'");
     return 1;
   }
   b = ($1_basetype *) $1;
-  for (ii = 0; ii < $1_size; ii++) b[ii] = *(($1_basetype *) temp + ii);
+  for (ii = 0; ii < (size_t) $1_size; ii++) b[ii] = *(($1_basetype *) temp + ii);
 }
 
 %typemap(varin) SWIGTYPE * {
diff --git a/SWIG/Lib/swig.swg b/SWIG/Lib/swig.swg
index 9911f4507..133df11bb 100644
--- a/SWIG/Lib/swig.swg
+++ b/SWIG/Lib/swig.swg
@@ -199,15 +199,15 @@ namespace std {
 /* memberin typemap for arrays.   */
 
 %typemap(memberin) SWIGTYPE [ANY] {
-  int ii;
+  size_t ii;
   $1_basetype *b = ($1_basetype *) $1;
-  for (ii = 0; ii < $1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);
+  for (ii = 0; ii < (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);
 }
 
 %typemap(globalin) SWIGTYPE [ANY] {
-  int ii;
+  size_t ii;
   $1_basetype *b = ($1_basetype *) $1;
-  for (ii = 0; ii < $1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);
+  for (ii = 0; ii < (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);
 }
 
 /* Typemap for variable length arguments sentinel value.  Used