From 58a9d81a0f6da15ee2481dd1451a182341ff2a5b Mon Sep 17 00:00:00 2001
From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Mon, 2 Dec 2013 17:54:32 -0500
Subject: [PATCH] Another fix to Java destruction order issues.  Thanks to
 Zheng Manchun for the report.

---
 src/expr/expr_manager.i | 2 +-
 src/smt/smt_engine.i    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/expr/expr_manager.i b/src/expr/expr_manager.i
index 8b9588214..f32d68274 100644
--- 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 5d59cae61..ff4105241 100644
--- 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
   }
-- 
2.30.2