diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-03-14 17:27:19 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-03-14 17:27:19 -0400 |
| commit | d1a8a1854d9a71d409f6af23a1f52471fc34deb0 (patch) | |
| tree | 64e2d695c249edbc18a161d7652a98a91a4fcfbb /src/expr | |
| parent | c03a972a85d565f10953ee58ec809f1751063f8e (diff) | |
| parent | fdb1a7181ad4883aa99893f3300ca766fb92d96e (diff) | |
Merge branch '1.0.x'
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 { |