Fix a handful of things for Mac, and Java bindings.

Also add a "mac-build" script that sets up prerequisites for Mac.

3 files changed, 5 insertions, 4 deletions

diff --git a/src/bindings/compat/java/include/cvc3/JniUtils.h b/src/bindings/compat/java/include/cvc3/JniUtils.h
index d4688fc25..45ce4f4ef 100644
--- a/src/bindings/compat/java/include/cvc3/JniUtils.h
+++ b/src/bindings/compat/java/include/cvc3/JniUtils.h
@@ -169,7 +169,7 @@ namespace Java_cvc3_JniUtils {
 	env->FindClass("java/lang/Object"),
 	NULL);
 
-    for (int i = 0; i < v.size(); ++i) {
+    for (size_t i = 0; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, embed_copy<T>(env, v[i]));
     }
 
@@ -183,7 +183,7 @@ namespace Java_cvc3_JniUtils {
 	env->FindClass("java/lang/Object"),
 	NULL);
 
-    for (int i = 0; i < v.size(); ++i) {
+    for (size_t i = 0; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, embed_const_ref<T>(env, &v[i]));
     }
 
@@ -196,7 +196,7 @@ namespace Java_cvc3_JniUtils {
     {
       jobjectArray jarray = (jobjectArray) env->NewObjectArray(v.size(),
           env->FindClass("[Ljava/lang/Object;"), NULL);
-      for (int i = 0; i < v.size(); ++i)
+      for (size_t i = 0; i < v.size(); ++i)
         {
           env->SetObjectArrayElement(jarray, i, toJavaVConstRef(env, v[i]));
         }
diff --git a/src/bindings/compat/java/src/cvc3/JniUtils.cpp b/src/bindings/compat/java/src/cvc3/JniUtils.cpp
index 9ae2023f6..ddab66546 100644
--- a/src/bindings/compat/java/src/cvc3/JniUtils.cpp
+++ b/src/bindings/compat/java/src/cvc3/JniUtils.cpp
@@ -63,6 +63,7 @@ namespace Java_cvc3_JniUtils {
     }
     
     DebugAssert(false, "JniUtils::toJava(QueryResult): unreachable");
+    return toJava(env, ""); // to avoid compiler warning
   }
 
   jstring toJava(JNIEnv* env, CVC3::FormulaValue result) {
diff --git a/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp b/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp
index 34feaacbb..70171c918 100644
--- a/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp
+++ b/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp
@@ -847,7 +847,7 @@ vc->loadFile(fileName, toCppInputLanguage(env, lang), false);
 
 DEFINITION: Java_cvc3_ValidityChecker_jniGetStatistics
 jobject m ValidityChecker vc
-return embed_mut_ref(env, &vc->getStatistics());
+return embed_copy(env, vc->getStatistics());
 
 DEFINITION: Java_cvc3_ValidityChecker_jniPrintStatistics
 void m ValidityChecker vc