Another fix to Java destruction order issues. Thanks to Zheng Manchun for the report.

diff --git a/src/expr/expr_manager.i b/src/expr/expr_manager.i
index 8b9588214b422edc279898a6d76c0808bb54cf6f..f32d68274ba415a96563163642478e0a54643113 100644 (file)
--- a/src/expr/expr_manager.i
+++ b/src/expr/expr_manager.i
@@ -7,7 +7,7 @@
   // before the ExprManager
   private Object options;
 %}
-%typemap(javaconstruct) ExprManager(Options options) {
+%typemap(javaconstruct) CVC4::ExprManager {
     this($imcall, true);
     this.options = SmtEngine.mkRef(options); // keep ref to options in SWIG proxy class
   }

diff --git a/src/smt/smt_engine.i b/src/smt/smt_engine.i
index 5d59cae61661f982aabfc3b71b7683baac4d37bb..ff4105241827e01a84fb2ec1163d5475f061228f 100644 (file)
--- a/src/smt/smt_engine.i
+++ b/src/smt/smt_engine.i
@@ -26,7 +26,7 @@ SWIGEXPORT void JNICALL Java_edu_nyu_acsys_CVC4_SmtEngine_dlRef(JNIEnv* jenv, jc
 }
 }
 %}
-%typemap(javaconstruct) SmtEngine(ExprManager em) {
+%typemap(javaconstruct) CVC4::SmtEngine {
     this($imcall, true);
     emRef = mkRef(em); // keep ref to expr manager in SWIG proxy class
   }