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

Warning fixes in generated Java code for 64bit Visual C++ on Windows.

Browse source
This commit is contained in:
William S Fulton 2015-07-03 19:34:16 +01:00
commit c7da8bb06e
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/java/director.swg
View file

@ -369,7 +369,7 @@ namespace Swig {
static char *copystr(const char *srcmsg) { static char *copystr(const char *srcmsg) {
char *target = 0; char *target = 0;
if (srcmsg) { if (srcmsg) {
int msglen = strlen(srcmsg) + 1; size_t msglen = strlen(srcmsg) + 1;
target = new char[msglen]; target = new char[msglen];
strncpy(target, srcmsg, msglen); strncpy(target, srcmsg, msglen);
} }

6
Lib/java/java.swg
View file

@ -1341,12 +1341,12 @@ SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE)
if ($input) JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0); if ($input) JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0);
} }
%typemap(directorin, descriptor="[B") (char *STRING, size_t LENGTH) { %typemap(directorin, descriptor="[B") (char *STRING, size_t LENGTH) {
jbyteArray jb = (jenv)->NewByteArray($2); jbyteArray jb = (jenv)->NewByteArray((jsize)$2);
(jenv)->SetByteArrayRegion(jb, 0, $2, (jbyte *)$1); (jenv)->SetByteArrayRegion(jb, 0, (jsize)$2, (jbyte *)$1);
$input = jb; $input = jb;
} }
%typemap(directorargout) (char *STRING, size_t LENGTH) %typemap(directorargout) (char *STRING, size_t LENGTH)
%{(jenv)->GetByteArrayRegion($input, 0, $2, (jbyte *)$1); %{(jenv)->GetByteArrayRegion($input, 0, (jsize)$2, (jbyte *)$1);
(jenv)->DeleteLocalRef($input);%} (jenv)->DeleteLocalRef($input);%}
%typemap(javadirectorin, descriptor="[B") (char *STRING, size_t LENGTH) "$jniinput" %typemap(javadirectorin, descriptor="[B") (char *STRING, size_t LENGTH) "$jniinput"
%apply (char *STRING, size_t LENGTH) { (char *STRING, int LENGTH) } %apply (char *STRING, size_t LENGTH) { (char *STRING, int LENGTH) }

2
Lib/java/various.i
View file

@ -65,7 +65,7 @@
%typemap(out) char **STRING_ARRAY { %typemap(out) char **STRING_ARRAY {
if ($1) { if ($1) {
int i; int i;
int len=0; jsize len=0;
jstring temp_string; jstring temp_string;
const jclass clazz = JCALL1(FindClass, jenv, "java/lang/String"); const jclass clazz = JCALL1(FindClass, jenv, "java/lang/String");