Fix #1238798 - Directors using unsigned long long or any other type
marshalled across the JNI boundary using a Java class (where the jni typemap contains jobject). Fix variable name clash in unsigned long long directorin typemap git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9436 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
b520e14991
commit
51662d55f3
1 changed files with 6 additions and 6 deletions
|
|
@ -323,11 +323,11 @@
|
||||||
jclass clazz = JCALL1(FindClass, jenv, "java/math/BigInteger");
|
jclass clazz = JCALL1(FindClass, jenv, "java/math/BigInteger");
|
||||||
jmethodID mid = JCALL3(GetMethodID, jenv, clazz, "<init>", "([B)V");
|
jmethodID mid = JCALL3(GetMethodID, jenv, clazz, "<init>", "([B)V");
|
||||||
jobject bigint;
|
jobject bigint;
|
||||||
int i;
|
int swig_i;
|
||||||
|
|
||||||
bae[0] = 0;
|
bae[0] = 0;
|
||||||
for(i=1; i<9; i++ ) {
|
for(swig_i=1; swig_i<9; swig_i++ ) {
|
||||||
bae[i] = (jbyte)($1>>8*(8-i));
|
bae[swig_i] = (jbyte)($1>>8*(8-swig_i));
|
||||||
}
|
}
|
||||||
|
|
||||||
JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
|
JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
|
||||||
|
|
@ -719,8 +719,8 @@
|
||||||
%typemap(directorin,descriptor="J") jlong "$input = $1;"
|
%typemap(directorin,descriptor="J") jlong "$input = $1;"
|
||||||
%typemap(directorin,descriptor="F") jfloat "$input = $1;"
|
%typemap(directorin,descriptor="F") jfloat "$input = $1;"
|
||||||
%typemap(directorin,descriptor="D") jdouble "$input = $1;"
|
%typemap(directorin,descriptor="D") jdouble "$input = $1;"
|
||||||
%typemap(directorin,descriptor="Ljava/lang/String;") jstring "$input = $1;"
|
%typemap(directorin,descriptor="Ljava/lang/String;") jstring "$input = $1;"
|
||||||
%typemap(directorin,descriptor="Ljava/lang/Object;") jobject "$input = $1;"
|
%typemap(directorin,descriptor="Ljava/lang/Object;",nouse="1") jobject "$input = $1;"
|
||||||
%typemap(directorin,descriptor="[Z") jbooleanArray "$input = $1;"
|
%typemap(directorin,descriptor="[Z") jbooleanArray "$input = $1;"
|
||||||
%typemap(directorin,descriptor="[C") jcharArray "$input = $1;"
|
%typemap(directorin,descriptor="[C") jcharArray "$input = $1;"
|
||||||
%typemap(directorin,descriptor="[B") jbyteArray "$input = $1;"
|
%typemap(directorin,descriptor="[B") jbyteArray "$input = $1;"
|
||||||
|
|
@ -729,7 +729,7 @@
|
||||||
%typemap(directorin,descriptor="[J") jlongArray "$input = $1;"
|
%typemap(directorin,descriptor="[J") jlongArray "$input = $1;"
|
||||||
%typemap(directorin,descriptor="[F") jfloatArray "$input = $1;"
|
%typemap(directorin,descriptor="[F") jfloatArray "$input = $1;"
|
||||||
%typemap(directorin,descriptor="[D") jdoubleArray "$input = $1;"
|
%typemap(directorin,descriptor="[D") jdoubleArray "$input = $1;"
|
||||||
%typemap(directorin,descriptor="[Ljava/lang/Object;") jobjectArray "$input = $1;"
|
%typemap(directorin,descriptor="[Ljava/lang/Object;",nouse="1") jobjectArray "$input = $1;"
|
||||||
|
|
||||||
%typemap(javadirectorin) jboolean,
|
%typemap(javadirectorin) jboolean,
|
||||||
jchar,
|
jchar,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue