|
From: <sm...@us...> - 2009-05-05 11:53:50
|
Revision: 9918
http://plplot.svn.sourceforge.net/plplot/?rev=9918&view=rev
Author: smekal
Date: 2009-05-05 11:53:37 +0000 (Tue, 05 May 2009)
Log Message:
-----------
Changes to remove compilation warnings (about redefinition of PySequence_Fast_GET_ITEM and implicit conversion of jint to int). Tested with ctest.
Modified Paths:
--------------
trunk/bindings/java/plplotjavac.i
trunk/bindings/python/plplotcmodule.i
Modified: trunk/bindings/java/plplotjavac.i
===================================================================
--- trunk/bindings/java/plplotjavac.i 2009-05-05 11:35:31 UTC (rev 9917)
+++ trunk/bindings/java/plplotjavac.i 2009-05-05 11:53:37 UTC (rev 9918)
@@ -1456,9 +1456,9 @@
%typemap(javaout) (int *p_argc, char **argv) {
return $jnicall;
}
-%typemap(in) (int *p_argc, char **argv) (jint size) {
+%typemap(in) (int *p_argc, char **argv) (int size) {
int i = 0;
- size = (*jenv)->GetArrayLength(jenv, $input);
+ size = (int)((*jenv)->GetArrayLength(jenv, $input));
$1 = &size;
$2 = (char **) malloc((size+1)*sizeof(char *));
/* make a copy of each string */
Modified: trunk/bindings/python/plplotcmodule.i
===================================================================
--- trunk/bindings/python/plplotcmodule.i 2009-05-05 11:35:31 UTC (rev 9917)
+++ trunk/bindings/python/plplotcmodule.i 2009-05-05 11:53:37 UTC (rev 9918)
@@ -64,7 +64,9 @@
#define PyArray_PLINT PyArray_INT
#endif
/* python-1.5 compatibility mode? */
-#define PySequence_Fast_GET_ITEM PySequence_GetItem
+#if !defined(PySequence_Fast_GET_ITEM)
+ #define PySequence_Fast_GET_ITEM PySequence_GetItem
+#endif
#define PySequence_Size PySequence_Length
%}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|