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 /test/unit | |
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 'test/unit')
-rw-r--r-- | test/unit/main/interactive_shell_black.h | 1 | ||||
-rw-r--r-- | test/unit/parser/parser_black.h | 1 | ||||
-rw-r--r-- | test/unit/util/boolean_simplification_black.h | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/test/unit/main/interactive_shell_black.h b/test/unit/main/interactive_shell_black.h index 6c3e73d2c..b351f5c3e 100644 --- a/test/unit/main/interactive_shell_black.h +++ b/test/unit/main/interactive_shell_black.h @@ -22,6 +22,7 @@ #include "expr/expr_manager.h" #include "main/interactive_shell.h" +#include "options/base_options.h" #include "options/language.h" #include "options/options.h" #include "parser/parser_builder.h" diff --git a/test/unit/parser/parser_black.h b/test/unit/parser/parser_black.h index 9b700eda6..6ecc76c2b 100644 --- a/test/unit/parser/parser_black.h +++ b/test/unit/parser/parser_black.h @@ -22,6 +22,7 @@ #include "base/output.h" #include "expr/expr.h" #include "expr/expr_manager.h" +#include "options/base_options.h" #include "options/language.h" #include "options/options.h" #include "parser/parser.h" diff --git a/test/unit/util/boolean_simplification_black.h b/test/unit/util/boolean_simplification_black.h index 355d4ff37..4c0eb81cc 100644 --- a/test/unit/util/boolean_simplification_black.h +++ b/test/unit/util/boolean_simplification_black.h @@ -18,6 +18,7 @@ #include <set> #include <vector> +#include "expr/expr_iomanip.h" #include "expr/kind.h" #include "expr/node.h" #include "expr/node_manager.h" @@ -102,7 +103,7 @@ public: TS_ASSERT_LESS_THAN_EQUALS(10u, BooleanSimplification::DUPLICATE_REMOVAL_THRESHOLD); - cout << Expr::setdepth(-1) + cout << expr::ExprSetDepth(-1) << language::SetLanguage(language::output::LANG_CVC4); } |