diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-03-26 17:58:39 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-03-26 19:43:25 -0400 |
| commit | ad5e31e2031349c9b9d0bf5d9fcaa1ea7950db58 (patch) | |
| tree | dd3e7e943628f1410f4a8d2f260c994d62be308d /src/parser | |
| parent | a9912269ab2b47b783a66f381b14148c0ac73e93 (diff) | |
Fixes for warnings from clang++, from -std=gnu++0x, from swig, and from javac
Diffstat (limited to 'src/parser')
| -rw-r--r-- | src/parser/cvc/Makefile.am | 2 | ||||
| -rw-r--r-- | src/parser/parser.i | 2 | ||||
| -rw-r--r-- | src/parser/parser_exception.i | 1 | ||||
| -rw-r--r-- | src/parser/smt1/Makefile.am | 2 | ||||
| -rw-r--r-- | src/parser/smt2/Makefile.am | 2 | ||||
| -rw-r--r-- | src/parser/tptp/Makefile.am | 2 |
6 files changed, 7 insertions, 4 deletions
diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am index b1cfe7bd8..7c5d48c1c 100644 --- a/src/parser/cvc/Makefile.am +++ b/src/parser/cvc/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES) -AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable $(WNO_CONVERSION_NULL) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTHESES) $(WNO_TAUTOLOGICAL_COMPARE) -Wno-unused-function -Wno-unused-variable $(WNO_CONVERSION_NULL) # Compile generated C files using C++ compiler CC=$(CXX) diff --git a/src/parser/parser.i b/src/parser/parser.i index 5b23555ea..37aefb901 100644 --- a/src/parser/parser.i +++ b/src/parser/parser.i @@ -19,6 +19,8 @@ namespace CVC4 { }/* namespace CVC4::parser */ }/* namespace CVC4 */ +%ignore CVC4::parser::Parser::ExprStream; + %include "parser/parser.h" %{ diff --git a/src/parser/parser_exception.i b/src/parser/parser_exception.i index 5be81034d..39f67e6f5 100644 --- a/src/parser/parser_exception.i +++ b/src/parser/parser_exception.i @@ -3,5 +3,6 @@ %} %ignore CVC4::parser::ParserException::ParserException(const char*); +%ignore CVC4::parser::ParserEndOfFileException::ParserEndOfFileException(const char*); %include "parser/parser_exception.h" diff --git a/src/parser/smt1/Makefile.am b/src/parser/smt1/Makefile.am index 578fae272..90ee7eb31 100644 --- a/src/parser/smt1/Makefile.am +++ b/src/parser/smt1/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES) -AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTHESES) $(WNO_TAUTOLOGICAL_COMPARE) -Wno-unused-function -Wno-unused-variable # Compile generated C files using C++ compiler AM_CFLAGS = $(AM_CXXFLAGS) diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am index ec445427a..bf42e9288 100644 --- a/src/parser/smt2/Makefile.am +++ b/src/parser/smt2/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES) -AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTHESES) $(WNO_TAUTOLOGICAL_COMPARE) -Wno-unused-function -Wno-unused-variable # Compile generated C files using C++ compiler AM_CFLAGS = $(AM_CXXFLAGS) diff --git a/src/parser/tptp/Makefile.am b/src/parser/tptp/Makefile.am index 0db7773b2..b5ac965e8 100644 --- a/src/parser/tptp/Makefile.am +++ b/src/parser/tptp/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES) -AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTHESES) $(WNO_TAUTOLOGICAL_COMPARE) -Wno-unused-function -Wno-unused-variable # Compile generated C files using C++ compiler AM_CFLAGS = $(AM_CXXFLAGS) |