diff options
| author | Tim King <taking@google.com> | 2015-12-30 11:45:37 -0800 |
|---|---|---|
| committer | Tim King <taking@google.com> | 2015-12-30 11:45:37 -0800 |
| commit | fa7f30a4ba08afe066604daee87006b4fb5f21f7 (patch) | |
| tree | 6eecac7cce64fa00f4ac5c18f023f1bc234435a3 /src/prop | |
| parent | 1ce397129214a427a10ff3e33069e315fe13eec1 (diff) | |
Shuffling around public vs. private headers
- Adding a script contrib/test_install_headers.h that tests whether one can include all cvc4_public headers. CVC4 can pass this test after this commit.
- Making lib/{clock_gettime.h,ffs.h,strtok_r.h} cvc4_private.
- Making prop/sat_solver_factory.h cvc4_private.
- Moving the expr iostream manipulators into their own files: expr_iomanip.{h,cpp}.
- Setting the generated *_options.h files back to being cvc4_private.
-- Removing the usage of options/expr_options.h from expr.h.
-- Removing the include of base_options.h from options.h.
- Cleaning up CPP macros in cvc4_public headers.
-- Changing the ROLL macro in floatingpoint.h into an inline function.
-- Removing the now unused flag -D__BUILDING_STATISTICS_FOR_EXPORT.
Diffstat (limited to 'src/prop')
| -rw-r--r-- | src/prop/minisat/minisat.cpp | 1 | ||||
| -rw-r--r-- | src/prop/prop_engine.cpp | 1 | ||||
| -rw-r--r-- | src/prop/sat_solver_factory.h | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/prop/minisat/minisat.cpp b/src/prop/minisat/minisat.cpp index 23a740a26..d9b8bb4f8 100644 --- a/src/prop/minisat/minisat.cpp +++ b/src/prop/minisat/minisat.cpp @@ -18,6 +18,7 @@ #include "prop/minisat/minisat.h" +#include "options/base_options.h" #include "options/decision_options.h" #include "options/prop_options.h" #include "options/smt_options.h" diff --git a/src/prop/prop_engine.cpp b/src/prop/prop_engine.cpp index 499cf1b56..2a1b05619 100644 --- a/src/prop/prop_engine.cpp +++ b/src/prop/prop_engine.cpp @@ -26,6 +26,7 @@ #include "expr/expr.h" #include "expr/resource_manager.h" #include "expr/result.h" +#include "options/base_options.h" #include "options/decision_options.h" #include "options/main_options.h" #include "options/options.h" diff --git a/src/prop/sat_solver_factory.h b/src/prop/sat_solver_factory.h index 34776c245..e0446eb4a 100644 --- a/src/prop/sat_solver_factory.h +++ b/src/prop/sat_solver_factory.h @@ -14,12 +14,13 @@ ** SAT Solver creation facility **/ -#pragma once +#include "cvc4_private.h" -#include "cvc4_public.h" +#pragma once #include <string> #include <vector> + #include "prop/sat_solver.h" namespace CVC4 { |