diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg
index cbb993064..3585e7a3f 100644
--- a/Lib/python/pyrun.swg
+++ b/Lib/python/pyrun.swg
@@ -1231,10 +1231,10 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
                   *ptr = vptr;
                   /* transfer the ownership to 'ptr' */
                   iobj->own = 0;
-                  SWIG_AddCastInplace(&res);
+                  res = SWIG_AddCast(res);
                   res = SWIG_AddNewMask(res);
                 } else {
-                  SWIG_AddCastInplace(&res);    
+                  res = SWIG_AddCast(res);		    
                 }
               }
             }
diff --git a/Lib/swigrun.swg b/Lib/swigrun.swg
index 3f68d66d6..e5afb62c4 100644
--- a/Lib/swigrun.swg
+++ b/Lib/swigrun.swg
@@ -161,20 +161,13 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCastInplace(int *r) {
-  if (SWIG_IsOK(*r)) {
-    *r = (SWIG_CastRank(*r) < SWIG_MAXCASTRANK) ? (*r + 1) : SWIG_ERROR;
-  }
-}
-SWIGINTERNINLINE int SWIG_AddCast(int r) {
-  SWIG_AddCastInplace(&r);
-  return r;
+SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+  return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
 SWIGINTERNINLINE int SWIG_CheckState(int r) { 
   return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCastInplace(r)
 #  define SWIG_AddCast
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif