jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply patch 1631987 - Java typemap for bool INOUT fails on big-endian machines

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9656 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2007-03-21 21:00:21 +00:00
commit 74aa9cef17
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -1,6 +1,10 @@
Version 1.3.32 (in progress) Version 1.3.32 (in progress)
============================ ============================
03/21/2007: wsfulton
[Java] Apply patch #1631987 from Ulrik Peterson - bool INOUT typemaps
fail on big endian machines.
03/16/2007: wsfulton 03/16/2007: wsfulton
Fix seg fault given dodgy C++ code: namespace abc::def { } Fix seg fault given dodgy C++ code: namespace abc::def { }

23
Lib/java/typemaps.i
View file

@ -388,7 +388,28 @@ INOUT_TYPEMAP(double, jdouble, double, Double, "[Ljava/lang/Double;", jdoubleArr
#undef INOUT_TYPEMAP #undef INOUT_TYPEMAP
/* Override the typemap in the INOUT_TYPEMAP macro */ /* Override typemaps in the INOUT_TYPEMAP macro for booleans to fix casts
as a jboolean isn't always the same size as a bool */
%typemap(in) bool *INOUT (bool btemp, jboolean *jbtemp), bool &INOUT (bool btemp, jboolean *jbtemp) {
if (!$input) {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
return $null;
}
if (JCALL1(GetArrayLength, jenv, $input) == 0) {
SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
return $null;
}
jbtemp = JCALL2(GetBooleanArrayElements, jenv, $input, 0);
btemp = (*jbtemp) ? true : false;
$1 = &btemp;
}
%typemap(argout) bool *INOUT, bool &INOUT {
*jbtemp$argnum = btemp$argnum ? (jboolean)1 : (jboolean)0;
JCALL3(ReleaseBooleanArrayElements, jenv, $input , (jboolean *)jbtemp$argnum, 0);
}
/* Override the typemap in the INOUT_TYPEMAP macro for unsigned long long */
%typemap(in) unsigned long long *INOUT ($*1_ltype temp), unsigned long long &INOUT ($*1_ltype temp) { %typemap(in) unsigned long long *INOUT ($*1_ltype temp), unsigned long long &INOUT ($*1_ltype temp) {
jobject bigint; jobject bigint;
jclass clazz; jclass clazz;