From 9b80ae6e390773f1055c10017dcaa1ca109f795e Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Fri, 27 Nov 2009 09:01:39 +0000 Subject: [PATCH] Type cast fix: stops compilation on Mac. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1589 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/include/prism.h | 2 +- prism/src/prism/prism.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prism/include/prism.h b/prism/include/prism.h index 962d5cda..0b1986f9 100644 --- a/prism/include/prism.h +++ b/prism/include/prism.h @@ -43,7 +43,7 @@ typedef struct FoxGlynnWeights } FoxGlynnWeights; // Function prototypes -EXPORT void get_string_array_from_java(JNIEnv *env, jobject strings_list, jstring *&strings_jstrings, const char **&strings, jint &size); +EXPORT void get_string_array_from_java(JNIEnv *env, jobject strings_list, jstring *&strings_jstrings, const char **&strings, int &size); EXPORT void release_string_array_from_java(JNIEnv *env, jstring *strings_jstrings, const char **strings, jint size); EXPORT FoxGlynnWeights fox_glynn(double q_tmax, double underflow, double overflow, double accuracy); diff --git a/prism/src/prism/prism.cc b/prism/src/prism/prism.cc index 633b1d6c..00b1931e 100644 --- a/prism/src/prism/prism.cc +++ b/prism/src/prism/prism.cc @@ -37,7 +37,7 @@ // actually stores arrays of both jstring objects and c strings, and also size // (because need these to free memory afterwards). -void get_string_array_from_java(JNIEnv *env, jobject strings_list, jstring *&strings_jstrings, const char **&strings, jint &size) +void get_string_array_from_java(JNIEnv *env, jobject strings_list, jstring *&strings_jstrings, const char **&strings, int &size) { int i, j; jclass vn_cls; @@ -48,7 +48,7 @@ void get_string_array_from_java(JNIEnv *env, jobject strings_list, jstring *&str if (vn_mid == 0) { return; } - size = env->CallIntMethod(strings_list,vn_mid); + size = (int)env->CallIntMethod(strings_list,vn_mid); // put strings from vector into array strings_jstrings = new jstring[size]; strings = new const char*[size];