Add newmemory parameter for SWIG_TypeCast

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10240 626c5289-ae23-0410-ae9c-e8d60b6d4f22

12 files changed, 51 insertions, 13 deletions

diff --git a/Lib/chicken/chickenrun.swg b/Lib/chicken/chickenrun.swg
index 4dbef87ea..bd7242407 100644
--- a/Lib/chicken/chickenrun.swg
+++ b/Lib/chicken/chickenrun.swg
@@ -275,7 +275,9 @@ SWIG_Chicken_ConvertPtr(C_word s, void **result, swig_type_info *type, int flags
     if (type) {
       cast = SWIG_TypeCheckStruct(from, type);
       if (cast) {
-        *result = SWIG_TypeCast(cast, (void *) C_block_item(s, 0));
+        int newmemory = 0;
+        *result = SWIG_TypeCast(cast, (void *) C_block_item(s, 0), &newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
       } else {
         return 1;
       }
diff --git a/Lib/guile/guile_gh_run.swg b/Lib/guile/guile_gh_run.swg
index 08e05154a..5b1fca0aa 100644
--- a/Lib/guile/guile_gh_run.swg
+++ b/Lib/guile/guile_gh_run.swg
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <assert.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -161,7 +162,9 @@ SWIG_Guile_ConvertPtr(swig_module_info *module, SCM s, void **result,
     if (type) {
       cast = SWIG_TypeCheckStruct(from, type);
       if (cast) {
-        *result = SWIG_TypeCast(cast, (void *) SCM_CDR(s));
+        int newmemory = 0;
+        *result = SWIG_TypeCast(cast, (void *) SCM_CDR(s), &newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
         return SWIG_OK;
       } else {
         return SWIG_ERROR;
diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg
index 6af494ed5..5da8558fc 100644
--- a/Lib/guile/guile_scm_run.swg
+++ b/Lib/guile/guile_scm_run.swg
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <assert.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -163,7 +164,9 @@ SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags)
     if (type) {
       cast = SWIG_TypeCheckStruct(from, type);
       if (cast) {
-        *result = SWIG_TypeCast(cast, (void *) SCM_CELL_WORD_1(smob));
+        int newmemory = 0;
+        *result = SWIG_TypeCast(cast, (void *) SCM_CELL_WORD_1(smob), &newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
         return SWIG_OK;
       } else {
         return SWIG_ERROR;
diff --git a/Lib/lua/luarun.swg b/Lib/lua/luarun.swg
index f27f2928a..751e062f0 100644
--- a/Lib/lua/luarun.swg
+++ b/Lib/lua/luarun.swg
@@ -608,7 +608,9 @@ SWIGRUNTIME int  SWIG_Lua_ConvertPtr(lua_State* L,int index,void** ptr,swig_type
     cast=SWIG_TypeCheckStruct(usr->type,type); /* performs normal type checking */
     if (cast)
     {
-      *ptr=SWIG_TypeCast(cast,usr->ptr);
+      int newmemory = 0;
+      *ptr=SWIG_TypeCast(cast,usr->ptr,&newmemory);
+      assert(!newmemory); /* newmemory handling not yet implemented */
       return SWIG_OK;  /* ok */
     }
   }
diff --git a/Lib/mzscheme/mzrun.swg b/Lib/mzscheme/mzrun.swg
index 3e0c9da65..3b05d2406 100644
--- a/Lib/mzscheme/mzrun.swg
+++ b/Lib/mzscheme/mzrun.swg
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <escheme.h>
+#include <assert.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -167,7 +168,9 @@ SWIG_MzScheme_ConvertPtr(Scheme_Object *s, void **result, swig_type_info *type,
     if (type) {
       cast = SWIG_TypeCheckStruct(proxy->type, type);
       if (cast) {
-        *result = SWIG_TypeCast(cast, proxy->object);
+        int newmemory = 0;
+        *result = SWIG_TypeCast(cast, proxy->object, &newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
         return 0;
       } else {
         return 1;
diff --git a/Lib/ocaml/ocaml.swg b/Lib/ocaml/ocaml.swg
index 0c7d0cf4f..5f8f929e2 100644
--- a/Lib/ocaml/ocaml.swg
+++ b/Lib/ocaml/ocaml.swg
@@ -65,7 +65,9 @@ extern "C" {
 			 tc ? tc->str : "<none>" );
 #endif
 		if( tc ) {
-		    *ptr = SWIG_TypeCast( tc, source );
+		    int newmemory = 0;
+		    *ptr = SWIG_TypeCast(tc, source, &newmemory);
+		    assert(!newmemory); /* newmemory handling not yet implemented */
 		    return 0;
 		} else
 		    return -1;
diff --git a/Lib/perl5/perlrun.swg b/Lib/perl5/perlrun.swg
index a2c15c6da..6a0bc415d 100644
--- a/Lib/perl5/perlrun.swg
+++ b/Lib/perl5/perlrun.swg
@@ -265,7 +265,11 @@ SWIG_Perl_ConvertPtr(SWIG_MAYBE_PERL_OBJECT SV *sv, void **ptr, swig_type_info *
     if (!tc) {
       return SWIG_ERROR;
     }
-    *ptr = SWIG_TypeCast(tc,voidptr);
+    {
+      int newmemory = 0;
+      *ptr = SWIG_TypeCast(tc,voidptr,&newmemory);
+      assert(!newmemory); /* newmemory handling not yet implemented */
+    }
   } else {
     *ptr = voidptr;
   }
diff --git a/Lib/php4/php4run.swg b/Lib/php4/php4run.swg
index 7fb51dc66..d38452764 100644
--- a/Lib/php4/php4run.swg
+++ b/Lib/php4/php4run.swg
@@ -122,6 +122,7 @@ SWIG_ZTS_SetPointerZval(zval *z, void *ptr, swig_type_info *type, int newobject
 static void *
 SWIG_ZTS_ConvertResourceData(void * p, const char *type_name, swig_type_info *ty TSRMLS_DC) {
   swig_cast_info *tc;
+  void *result = 0;
 
   if (!ty) {
     /* They don't care about the target type, so just pass on the pointer! */
@@ -135,8 +136,12 @@ SWIG_ZTS_ConvertResourceData(void * p, const char *type_name, swig_type_info *ty
 
   /* convert and cast p from type_name to ptr as ty. */
   tc = SWIG_TypeCheck(type_name, ty);
-  if (!tc) return NULL;
-  return SWIG_TypeCast(tc, p);
+  if (tc) {
+    int newmemory = 0;
+    result = SWIG_TypeCast(tc, p, &newmemory);
+    assert(!newmemory); /* newmemory handling not yet implemented */
+  }
+  return result;
 }
 
 /* This function returns a pointer of type ty by extracting the pointer
diff --git a/Lib/pike/pikerun.swg b/Lib/pike/pikerun.swg
index 79529a0fb..875fcf4e2 100644
--- a/Lib/pike/pikerun.swg
+++ b/Lib/pike/pikerun.swg
@@ -56,7 +56,9 @@ SWIG_Pike_ConvertPtr(struct object *obj, void **ptr, swig_type_info *ty, int fla
         if (obj_wrapper && obj_wrapper->type) {
             tc = SWIG_TypeCheckStruct(obj_wrapper->type, ty);
             if (tc) {
-                *ptr = SWIG_TypeCast(tc, obj_wrapper->self);
+                int newmemory = 0;
+                *ptr = SWIG_TypeCast(tc, obj_wrapper->self, &newmemory);
+                assert(!newmemory); /* newmemory handling not yet implemented */
                 return 0;
             }
         }
diff --git a/Lib/r/rrun.swg b/Lib/r/rrun.swg
index b92167aa8..91d23eaff 100644
--- a/Lib/r/rrun.swg
+++ b/Lib/r/rrun.swg
@@ -14,6 +14,7 @@ extern "C" {
 #include <Rdefines.h>
 #include <Rversion.h>
 #include <stdlib.h>
+#include <assert.h>
 
 #define SWIGR 1
 
@@ -289,7 +290,9 @@ SWIG_R_ConvertPtr(SEXP obj, void **ptr, swig_type_info *ty, int flags) {
       if (ptr) *ptr = vptr;
     } else {
       swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
-      if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
+      int newmemory = 0;
+      if (ptr) *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+      assert(!newmemory); /* newmemory handling not yet implemented */
     }
   } else {
       if (ptr) *ptr = vptr;
diff --git a/Lib/ruby/rubyrun.swg b/Lib/ruby/rubyrun.swg
index bcb15f327..24d861d5a 100644
--- a/Lib/ruby/rubyrun.swg
+++ b/Lib/ruby/rubyrun.swg
@@ -57,6 +57,7 @@
 #define SWIG_MangleStr(value)                        	SWIG_Ruby_MangleStr(value)		  
 #define SWIG_CheckConvert(value, ty)                 	SWIG_Ruby_CheckConvert(value, ty)	  
 
+#include "assert.h"
 
 /* -----------------------------------------------------------------------------
  * pointers/data manipulation
@@ -318,8 +319,11 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
     tc = SWIG_TypeCheck(c, ty);
     if (!tc) {
       return SWIG_ERROR;
+    } else {
+      int newmemory = 0;
+      *ptr = SWIG_TypeCast(tc, vptr, &newmemory);
+      assert(!newmemory); /* newmemory handling not yet implemented */
     }
-    *ptr = SWIG_TypeCast(tc, vptr);
   } else {
     *ptr = vptr;
   }
diff --git a/Lib/tcl/tclrun.swg b/Lib/tcl/tclrun.swg
index 47c6d7b04..6387fb008 100644
--- a/Lib/tcl/tclrun.swg
+++ b/Lib/tcl/tclrun.swg
@@ -70,6 +70,7 @@
 #define SWIG_GetConstant        SWIG_GetConstantObj
 #define SWIG_Tcl_GetConstant    SWIG_Tcl_GetConstantObj
 
+#include "assert.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -166,7 +167,11 @@ SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *interp, const char *c, void **ptr, swi
     if (flags & SWIG_POINTER_DISOWN) {
       SWIG_Disown((void *) *ptr);
     }
-    *ptr = SWIG_TypeCast(tc,(void *) *ptr);
+    {
+      int newmemory = 0;
+      *ptr = SWIG_TypeCast(tc,(void *) *ptr,&newmemory);
+      assert(!newmemory); /* newmemory handling not yet implemented */
+    }
   }
   return SWIG_OK;
 }