From e92cc97ab7eea62b97cfea9f9fa08d4b6719be77 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Tue, 4 Oct 2011 01:42:45 +0000 Subject: Yet Another Antlr3 Mod---this time, all my fault: for configuration auto-detection of libantlr3c, I chose an innocent-looking function that was present in both versions. But it's signature had changed, breaking source compatibility in both directions. Just like the other function that started the whole mess. Silly me. --- config/antlr.m4 | 2 +- src/expr/expr_manager.i | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/antlr.m4 b/config/antlr.m4 index cb6e2dc64..b376c0ecc 100644 --- a/config/antlr.m4 +++ b/config/antlr.m4 @@ -64,7 +64,7 @@ AC_DEFUN([AC_LIB_ANTLR],[ #include 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 90d0942b4..b4d2051e3 100644 --- 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; +%template(mkConst) CVC4::ExprManager::mkConst< CVC4::Rational >; %include "expr/expr_manager.h" -- cgit v1.2.3