diff options
| author | Christopher L. Conway <christopherleeconway@gmail.com> | 2010-10-22 22:50:33 +0000 |
|---|---|---|
| committer | Christopher L. Conway <christopherleeconway@gmail.com> | 2010-10-22 22:50:33 +0000 |
| commit | a486cdde94366aa6b4a1f558eecc0130ba25ad5e (patch) | |
| tree | 8931708b9046ec62c7bdd513de9de1e5a507aa53 /src/prop | |
| parent | 6dee1d9817d8e9209f0a681b7c601ec6b4b5014d (diff) | |
Merging main/getopt.cpp, main/usage.h, and smt/options.h in
util/options.h,cpp
Diffstat (limited to 'src/prop')
| -rw-r--r-- | src/prop/prop_engine.cpp | 4 | ||||
| -rw-r--r-- | src/prop/prop_engine.h | 4 | ||||
| -rw-r--r-- | src/prop/sat.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/prop/prop_engine.cpp b/src/prop/prop_engine.cpp index f503efae2..5851f3990 100644 --- a/src/prop/prop_engine.cpp +++ b/src/prop/prop_engine.cpp @@ -21,10 +21,10 @@ #include "sat.h" #include "theory/theory_engine.h" -#include "util/decision_engine.h" #include "util/Assert.h" +#include "util/decision_engine.h" +#include "util/options.h" #include "util/output.h" -#include "smt/options.h" #include "util/result.h" #include <utility> diff --git a/src/prop/prop_engine.h b/src/prop/prop_engine.h index 1c7c506ee..ecef29ac2 100644 --- a/src/prop/prop_engine.h +++ b/src/prop/prop_engine.h @@ -24,9 +24,9 @@ #define __CVC4__PROP_ENGINE_H #include "expr/node.h" -#include "util/result.h" #include "util/decision_engine.h" -#include "smt/options.h" +#include "util/options.h" +#include "util/result.h" namespace CVC4 { diff --git a/src/prop/sat.h b/src/prop/sat.h index 17bf447f8..550de5527 100644 --- a/src/prop/sat.h +++ b/src/prop/sat.h @@ -25,9 +25,9 @@ // Optional blocks below will be unconditionally included #define __CVC4_USE_MINISAT -#include "util/stats.h" #include "theory/theory.h" -#include "smt/options.h" +#include "util/options.h" +#include "util/stats.h" #ifdef __CVC4_USE_MINISAT |