From: Andrew R. <and...@us...> - 2005-01-24 10:13:56
|
Update of /cvsroot/plplot/plplot/bindings/java In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6617/bindings/java Modified Files: plplotjavac.i Log Message: Fix an over-zealous use of PLINT in the swig generated bindings. plParseOpts takes an int as the number of command line arguments, not a PLINT. Fixes compile warnings for java and python. Index: plplotjavac.i =================================================================== RCS file: /cvsroot/plplot/plplot/bindings/java/plplotjavac.i,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- plplotjavac.i 19 Jan 2005 22:40:10 -0000 1.20 +++ plplotjavac.i 24 Jan 2005 10:13:16 -0000 1.21 @@ -931,14 +931,14 @@ /* Character arrays: */ -%typemap(jni) (PLINT *p_argc, char **argv) "jobjectArray" -%typemap(jtype) (PLINT *p_argc, char **argv) "String[]" -%typemap(jstype) (PLINT *p_argc, char **argv) "String[]" -%typemap(javain) (PLINT *p_argc, char **argv) "$javainput" -%typemap(javaout) (PLINT *p_argc, char **argv) { +%typemap(jni) (int *p_argc, char **argv) "jobjectArray" +%typemap(jtype) (int *p_argc, char **argv) "String[]" +%typemap(jstype) (int *p_argc, char **argv) "String[]" +%typemap(javain) (int *p_argc, char **argv) "$javainput" +%typemap(javaout) (int *p_argc, char **argv) { return $jnicall; } -%typemap(in) (PLINT *p_argc, char **argv) (jint size) { +%typemap(in) (int *p_argc, char **argv) (jint size) { int i = 0; size = (*jenv)->GetArrayLength(jenv, $input); $1 = &size; @@ -959,7 +959,7 @@ } /* This cleans up the memory we malloc'd before the function call */ -%typemap(freearg) (PLINT *p_argc, char **argv) { +%typemap(freearg) (int *p_argc, char **argv) { int i; /* Commented out version straight from swig documentation, but I think * it is wrong. |