diff options
| author | Liana Hadarean <lianahady@gmail.com> | 2013-03-19 22:09:55 -0400 |
|---|---|---|
| committer | Liana Hadarean <lianahady@gmail.com> | 2013-03-19 22:09:55 -0400 |
| commit | c30b3e2c03f9c3df51eb8d2e7cb6c72907cb77c0 (patch) | |
| tree | 35ffaacc7ba2b0d2d7b6b4e47112fcd41f560b2d /src/expr | |
| parent | 4cd63abf2ab901ad8d1b1c2cc2e84707736b5659 (diff) | |
| parent | 66175a0f0e8d9cf3bc89c3d422ef5b18b217a7da (diff) | |
merged master with dejan's constant evaluating equality engine
Diffstat (limited to 'src/expr')
| -rw-r--r-- | src/expr/Makefile.am | 2 | ||||
| -rw-r--r-- | src/expr/expr_template.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am index 0f3a95cdc..bf52da184 100644 --- a/src/expr/Makefile.am +++ b/src/expr/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. + -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libexpr.la diff --git a/src/expr/expr_template.h b/src/expr/expr_template.h index f5df63f8c..b8893c34c 100644 --- a/src/expr/expr_template.h +++ b/src/expr/expr_template.h @@ -935,7 +935,7 @@ public: ${getConst_instantiations} -#line 924 "${template}" +#line 939 "${template}" namespace expr { |