diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-11-06 16:58:16 -0500 |
|---|---|---|
| committer | Tianyi Liang <tianyi-liang@uiowa.edu> | 2013-11-10 18:47:35 -0600 |
| commit | 726603e0e5a5482cf98538079790747e43313276 (patch) | |
| tree | 12e41e99a21a16cf9cff7374a84d9a6527f03c8b /src/theory/uf | |
| parent | 6c6f44c32a6bb957c1e82ae75fbf62db2e286595 (diff) | |
Flatten libcvc4 build structure; remove some #include interdependences
Diffstat (limited to 'src/theory/uf')
| -rw-r--r-- | src/theory/uf/Makefile | 4 | ||||
| -rw-r--r-- | src/theory/uf/Makefile.am | 25 | ||||
| -rw-r--r-- | src/theory/uf/equality_engine.h | 1 | ||||
| -rw-r--r-- | src/theory/uf/theory_uf.h | 2 | ||||
| -rw-r--r-- | src/theory/uf/theory_uf_model.cpp | 1 | ||||
| -rw-r--r-- | src/theory/uf/theory_uf_strong_solver.h | 1 |
6 files changed, 4 insertions, 30 deletions
diff --git a/src/theory/uf/Makefile b/src/theory/uf/Makefile deleted file mode 100644 index c3c641384..000000000 --- a/src/theory/uf/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -topdir = ../../.. -srcdir = src/theory/uf - -include $(topdir)/Makefile.subdir diff --git a/src/theory/uf/Makefile.am b/src/theory/uf/Makefile.am deleted file mode 100644 index 50c508092..000000000 --- a/src/theory/uf/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -AM_CPPFLAGS = \ - -D__BUILDING_CVC4LIB \ - -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. -AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) - -noinst_LTLIBRARIES = libuf.la - -libuf_la_SOURCES = \ - theory_uf.h \ - theory_uf.cpp \ - theory_uf_type_rules.h \ - theory_uf_rewriter.h \ - equality_engine.h \ - equality_engine_types.h \ - equality_engine.cpp \ - symmetry_breaker.h \ - symmetry_breaker.cpp \ - theory_uf_strong_solver.h \ - theory_uf_strong_solver.cpp \ - theory_uf_model.h \ - theory_uf_model.cpp - -EXTRA_DIST = \ - kinds \ - options_handlers.h diff --git a/src/theory/uf/equality_engine.h b/src/theory/uf/equality_engine.h index 8d1b6f1d9..a9294dc69 100644 --- a/src/theory/uf/equality_engine.h +++ b/src/theory/uf/equality_engine.h @@ -27,6 +27,7 @@ #include "expr/node.h" #include "expr/kind_map.h" #include "context/cdo.h" +#include "context/cdhashmap.h" #include "util/output.h" #include "util/statistics_registry.h" #include "theory/rewriter.h" diff --git a/src/theory/uf/theory_uf.h b/src/theory/uf/theory_uf.h index 9ca146bde..2c9b4b7d5 100644 --- a/src/theory/uf/theory_uf.h +++ b/src/theory/uf/theory_uf.h @@ -21,7 +21,7 @@ #define __CVC4__THEORY__UF__THEORY_UF_H #include "expr/node.h" -#include "expr/attribute.h" +//#include "expr/attribute.h" #include "theory/theory.h" #include "theory/uf/equality_engine.h" diff --git a/src/theory/uf/theory_uf_model.cpp b/src/theory/uf/theory_uf_model.cpp index 284212ba9..bf41a256d 100644 --- a/src/theory/uf/theory_uf_model.cpp +++ b/src/theory/uf/theory_uf_model.cpp @@ -12,6 +12,7 @@ ** \brief Implementation of Theory UF Model **/ +#include "expr/attribute.h" #include "theory/theory_engine.h" #include "theory/uf/theory_uf_model.h" #include "theory/uf/equality_engine.h" diff --git a/src/theory/uf/theory_uf_strong_solver.h b/src/theory/uf/theory_uf_strong_solver.h index 9111ec6a7..079a03c36 100644 --- a/src/theory/uf/theory_uf_strong_solver.h +++ b/src/theory/uf/theory_uf_strong_solver.h @@ -21,6 +21,7 @@ #include "context/context.h" #include "context/context_mm.h" +#include "context/cdhashmap.h" #include "context/cdchunk_list.h" #include "util/statistics_registry.h" |