Fix for gcc warning -Wunused-value without triggering -Wunused-parameter

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

12 files changed, 23 insertions, 24 deletions

diff --git a/Lib/chicken/chickenrun.swg b/Lib/chicken/chickenrun.swg
index f4e94d6f6..07db41945 100644
--- a/Lib/chicken/chickenrun.swg
+++ b/Lib/chicken/chickenrun.swg
@@ -36,7 +36,7 @@ extern "C" {
                                               SWIG_Chicken_Barf(SWIG_BARF1_CONTRACT_ASSERT, C_text(message)); } else
 
 /* Runtime API */
-#define SWIG_GetModule(clientdata) SWIG_Chicken_GetModule()
+#define SWIG_GetModule(clientdata) SWIG_Chicken_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Chicken_SetModule(pointer)
 
 #define C_swig_is_bool(x) C_truep (C_booleanp (x))
@@ -309,7 +309,7 @@ SWIG_Chicken_MustGetPtr (C_word s, swig_type_info *type, int argnum, int flags)
 static char *chicken_runtimevar_name = "type_pointer" SWIG_TYPE_TABLE_NAME;
 
 static swig_module_info *
-SWIG_Chicken_GetModule() {
+SWIG_Chicken_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
     swig_module_info *ret = 0;
     C_word sym;
 
diff --git a/Lib/guile/guile_gh_run.swg b/Lib/guile/guile_gh_run.swg
index 0eba1f97e..d8cc56b91 100644
--- a/Lib/guile/guile_gh_run.swg
+++ b/Lib/guile/guile_gh_run.swg
@@ -27,7 +27,7 @@ typedef SCM (*swig_guile_proc)();
   SWIG_Guile_MustGetPtr(&swig_module, s, type, argnum, flags, FUNC_NAME)
 #define SWIG_NewPointerObj(ptr, type, owner) \
   SWIG_Guile_NewPointerObj(&swig_module, (void*)ptr, type, owner)
-#define SWIG_GetModule(clientdata) SWIG_Guile_GetModule()
+#define SWIG_GetModule(clientdata) SWIG_Guile_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Guile_SetModule(pointer)
 
 /* Ignore object-ownership changes in gh mode */
@@ -114,14 +114,14 @@ SWIG_Guile_LookupType(swig_module_info *module, SCM s, int normal)
 
 #ifdef SWIG_GUILE_MODULE_STATIC
 static swig_module_info *swig_guile_module = 0;
-SWIG_GUILE_MODULE_STATIC swig_module_info *SWIG_Guile_GetModule(void) {
+SWIG_GUILE_MODULE_STATIC swig_module_info *SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   return swig_guile_module;
 }
 SWIG_GUILE_MODULE_STATIC void SWIG_Guile_SetModule(swig_module_info *pointer) {
   swig_guile_module = pointer;
 }
 #else
-SWIGEXPORT swig_module_info * SWIG_Guile_GetModule(void);
+SWIGEXPORT swig_module_info * SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata));
 SWIGEXPORT void SWIG_Guile_SetModule(swig_module_info *pointer);
 #endif
 
diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg
index 91b74095d..925aaadb4 100644
--- a/Lib/guile/guile_scm_run.swg
+++ b/Lib/guile/guile_scm_run.swg
@@ -53,8 +53,8 @@ typedef struct swig_guile_clientdata {
   SWIG_Guile_NewMemberObj(ptr, sz, type, FUNC_NAME)
   
 /* Runtime API */
-static swig_module_info *SWIG_Guile_GetModule(void);
-#define SWIG_GetModule(clientdata) SWIG_Guile_GetModule()
+static swig_module_info *SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata));
+#define SWIG_GetModule(clientdata) SWIG_Guile_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Guile_SetModule(pointer)
   
 SWIGINTERN char *
@@ -204,7 +204,7 @@ SWIGINTERNINLINE int
 SWIG_Guile_IsPointer (SCM s)
 {
   /* module might not be initialized yet, so initialize it */
-  SWIG_Guile_GetModule();
+  SWIG_GetModule(0);
   return SWIG_Guile_IsPointerOfType (s, NULL);
 }
 
@@ -419,7 +419,7 @@ SWIG_Guile_Init ()
 }
 
 SWIGINTERN swig_module_info *
-SWIG_Guile_GetModule(void)
+SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata))
 {
   SCM module;
   SCM variable;
diff --git a/Lib/ocaml/ocaml.swg b/Lib/ocaml/ocaml.swg
index 5f8f929e2..a00252b28 100644
--- a/Lib/ocaml/ocaml.swg
+++ b/Lib/ocaml/ocaml.swg
@@ -578,7 +578,7 @@ extern "C" {
 	}	
     }
 
-    static swig_module_info *SWIG_Ocaml_GetModule() {
+    static swig_module_info *SWIG_Ocaml_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
       CAML_VALUE pointer;
 
       pointer = callback(*caml_named_value("swig_find_type_info"), caml_val_int(0));
diff --git a/Lib/ocaml/ocamldec.swg b/Lib/ocaml/ocamldec.swg
index 8e452d3f9..e6b8939fb 100644
--- a/Lib/ocaml/ocamldec.swg
+++ b/Lib/ocaml/ocamldec.swg
@@ -108,7 +108,7 @@ CAMLextern int64 Int64_val(caml_value_t v);
 #endif
 
 #define SWIG_NewPointerObj(p,type,flags) caml_val_ptr(p,type)
-#define SWIG_GetModule(clientdata) SWIG_Ocaml_GetModule()
+#define SWIG_GetModule(clientdata) SWIG_Ocaml_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Ocaml_SetModule(pointer)
 
 #define SWIG_contract_assert(expr, msg) if(!(expr)) {failwith(msg);} else
diff --git a/Lib/perl5/perlrun.swg b/Lib/perl5/perlrun.swg
index 5c1b586b4..ebc4fecd5 100644
--- a/Lib/perl5/perlrun.swg
+++ b/Lib/perl5/perlrun.swg
@@ -40,7 +40,7 @@
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Perl_GetModule()
+#define SWIG_GetModule(clientdata)                      SWIG_Perl_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer)             SWIG_Perl_SetModule(pointer)
 
 
@@ -477,7 +477,7 @@ SWIGRUNTIME void _swig_create_magic(CPerlObj *pPerl, SV *sv, const char *name, i
 
 
 SWIGRUNTIME swig_module_info *
-SWIG_Perl_GetModule(void) {
+SWIG_Perl_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   static void *type_pointer = (void *)0;
   SV *pointer;
 
diff --git a/Lib/php/phprun.swg b/Lib/php/phprun.swg
index 1404955e0..92f2f3fe5 100644
--- a/Lib/php/phprun.swg
+++ b/Lib/php/phprun.swg
@@ -79,7 +79,7 @@ static int default_error_code = E_ERROR;
   if (!(expr) ) { zend_printf("Contract Assert Failed %s\n",msg ); } else
 
 /* Standard SWIG API */
-#define SWIG_GetModule(clientdata) SWIG_Php_GetModule()
+#define SWIG_GetModule(clientdata) SWIG_Php_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Php_SetModule(pointer)
 
 /* used to wrap returned objects in so we know whether they are newobject
@@ -252,7 +252,7 @@ SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC
 }
 
 static char const_name[] = "swig_runtime_data_type_pointer";
-static swig_module_info *SWIG_Php_GetModule() {
+static swig_module_info *SWIG_Php_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   zval *pointer;
   swig_module_info *ret = 0;
 
diff --git a/Lib/pike/pikerun.swg b/Lib/pike/pikerun.swg
index 451a4e092..70d40fac9 100644
--- a/Lib/pike/pikerun.swg
+++ b/Lib/pike/pikerun.swg
@@ -28,11 +28,11 @@ typedef struct swig_object_wrapper {
 
 #define SWIG_ConvertPtr SWIG_Pike_ConvertPtr
 #define SWIG_NewPointerObj SWIG_Pike_NewPointerObj
-#define SWIG_GetModule(clientdata) SWIG_Pike_GetModule()
+#define SWIG_GetModule(clientdata) SWIG_Pike_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Pike_SetModule(pointer)
 
 /* These need to be filled in before type sharing between modules will work */
-static swig_module_info *SWIG_Pike_GetModule() {
+static swig_module_info *SWIG_Pike_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   return 0;
 }
 
diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg
index d621f4dee..3585e7a3f 100644
--- a/Lib/python/pyrun.swg
+++ b/Lib/python/pyrun.swg
@@ -45,7 +45,7 @@
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule()
+#define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer)             SWIG_Python_SetModule(pointer)
 #define SWIG_NewClientData(obj)                         SwigPyClientData_New(obj)
 
@@ -1484,7 +1484,7 @@ void *SWIG_ReturnGlobalTypeList(void *);
 #endif
 
 SWIGRUNTIME swig_module_info *
-SWIG_Python_GetModule(void) {
+SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   static void *type_pointer = (void *)0;
   /* first check if module already created */
   if (!type_pointer) {
@@ -1610,7 +1610,7 @@ SWIG_Python_TypeQuery(const char *type)
     descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
 #endif
   } else {
-    swig_module_info *swig_module = SWIG_Python_GetModule();
+    swig_module_info *swig_module = SWIG_GetModule(0);
     descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
     if (descriptor) {
 #ifdef SWIGPY_USE_CAPSULE
diff --git a/Lib/r/rrun.swg b/Lib/r/rrun.swg
index 1c9a22d4c..c441a5222 100644
--- a/Lib/r/rrun.swg
+++ b/Lib/r/rrun.swg
@@ -293,7 +293,7 @@ SWIG_R_ConvertPtr(SEXP obj, void **ptr, swig_type_info *ty, int flags) {
 }
 
 SWIGRUNTIME swig_module_info *
-SWIG_GetModule(void *v) {
+SWIG_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   static void *type_pointer = (void *)0;
   return (swig_module_info *) type_pointer;
 }
diff --git a/Lib/ruby/rubyrun.swg b/Lib/ruby/rubyrun.swg
index a2d246e97..00fb11f39 100644
--- a/Lib/ruby/rubyrun.swg
+++ b/Lib/ruby/rubyrun.swg
@@ -35,7 +35,7 @@
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule()	
+#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
 
 
@@ -371,7 +371,7 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
 }
 
 SWIGRUNTIME swig_module_info *
-SWIG_Ruby_GetModule(void)
+SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
 {
   VALUE pointer;
   swig_module_info *ret = 0;
diff --git a/Lib/swiginit.swg b/Lib/swiginit.swg
index d160cfaf1..f747bccdf 100644
--- a/Lib/swiginit.swg
+++ b/Lib/swiginit.swg
@@ -56,7 +56,6 @@ SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
   int found, init;
-  (void *)clientdata;
 
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {