From 802f822594a1f2f7e742b9f33d23e78cca0f6863 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Mon, 5 Apr 2010 17:17:38 +0000 Subject: [PATCH] fix most of the warnings in the parser by (1) quieting unused-function and unused-variable warnings in the generated code, which aren't useful, and (2) not #including our autoheader stuff in the parser, which was conflicting with antlr3's --- src/include/cvc4parser_private.h | 5 ++++- src/parser/cvc/Makefile.am | 2 +- src/parser/smt/Makefile.am | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/include/cvc4parser_private.h b/src/include/cvc4parser_private.h index 6704daca2..5960b5c61 100644 --- a/src/include/cvc4parser_private.h +++ b/src/include/cvc4parser_private.h @@ -22,6 +22,9 @@ #endif /* ! (__BUILDING_CVC4PARSERLIB || __BUILDING_CVC4PARSERLIB_UNIT_TEST) */ #include "cvc4parser_public.h" -#include "cvc4autoconfig.h" +// It would be nice to #include this here, but there are conflicts with +// antlr3's autoheader stuff, which they export :( +// +// #include "cvc4autoconfig.h" #endif /* __CVC4PARSER_PRIVATE_H */ diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am index 08e6c4d52..288b79b15 100644 --- a/src/parser/cvc/Makefile.am +++ b/src/parser/cvc/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES) -AM_CXXFLAGS = -Wall $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable # Compile generated C files using C++ compiler CC=$(CXX) diff --git a/src/parser/smt/Makefile.am b/src/parser/smt/Makefile.am index 3ffe61b05..792527816 100644 --- a/src/parser/smt/Makefile.am +++ b/src/parser/smt/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES) -AM_CXXFLAGS = -Wall $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable # Compile generated C files using C++ compiler AM_CFLAGS = $(AM_CXXFLAGS) -- 2.30.2