Some patches to CVC3 compatibility layer; Thanks to Adam Buchbinder @ Google for...

diff --git a/src/bindings/compat/c/c_interface_defs.h b/src/bindings/compat/c/c_interface_defs.h
index f30e9b797902e1e827b3f92aaf98d0516db1d8c4..0f0155324d98985e8484b1bc1fb01132309c30d6 100644 (file)
--- a/src/bindings/compat/c/c_interface_defs.h
+++ b/src/bindings/compat/c/c_interface_defs.h
@@ -21,7 +21,7 @@
 #include "cvc4_public.h"
 
 #ifndef _cvc3__include__c_interface_defs_h_
-#define _cvc3__include__c_interface__defs_h_
+#define _cvc3__include__c_interface_defs_h_
 
 //#include "kinds.h"
 

diff --git a/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp b/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp
index fa608a785c9ec5963d1b368e9bc31ba5d69986fb..6bab7d2e0a0ccb74de74cf3488ebb3507cbbef97 100644 (file)
--- a/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp
+++ b/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp
@@ -418,7 +418,7 @@ return embed_copy(env, vc->recordExpr(field1, *expr1, field2, *expr2));
 
 DEFINITION: Java_cvc3_ValidityChecker_jniRecordExpr3
 jobject m ValidityChecker vc n string field1 c Expr expr1 n string field2 c Expr expr2 n string field3 c Expr expr3
-return embed_copy(env, vc->recordExpr(field1, *expr1, field2, *expr2, field2, *expr2));
+return embed_copy(env, vc->recordExpr(field1, *expr1, field2, *expr2, field3, *expr3));
 
 DEFINITION: Java_cvc3_ValidityChecker_jniRecordExpr4
 jobject m ValidityChecker vc nv string fields cv Expr exprs