Yet Another Antlr3 Mod---this time, all my fault: for configuration auto-detection...

diff --git a/config/antlr.m4 b/config/antlr.m4
index cb6e2dc64d255738306c8d390f758afdb77c265e..b376c0ecc0c16b670099b08d576f124aff88a14f 100644 (file)
--- a/config/antlr.m4
+++ b/config/antlr.m4
@@ -64,7 +64,7 @@ AC_DEFUN([AC_LIB_ANTLR],[
         #include <antlr3.h>
 
         int main() {
-          pANTLR3_STRING_FACTORY factory = antlr3StringFactoryNew(ANTLR3_ENC_8BIT);
+          pANTLR3_TOKEN_FACTORY factory = antlr3TokenFactoryNew((pANTLR3_INPUT_STREAM) NULL);
           return 0;
         }
       ],

diff --git a/src/expr/expr_manager.i b/src/expr/expr_manager.i
index 90d0942b4042d8ed12a6e1dd8637288890d3f5fb..b4d2051e3d147baa5eb098a4aafab093eb155210 100644 (file)
--- a/src/expr/expr_manager.i
+++ b/src/expr/expr_manager.i
@@ -5,6 +5,6 @@
 %include "expr/expr_manager.h"
 
 %template(mkConst) CVC4::ExprManager::mkConst< CVC4::Integer >;
-%template(mkConst) CVC4::ExprManager::mkConst<CVC4::Rational>;
+%template(mkConst) CVC4::ExprManager::mkConst< CVC4::Rational >;
 
 %include "expr/expr_manager.h"