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/compat | |
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/compat')
-rw-r--r-- | src/compat/cvc3_compat.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compat/cvc3_compat.cpp b/src/compat/cvc3_compat.cpp index 3fa790f3e..24c4d8112 100644 --- a/src/compat/cvc3_compat.cpp +++ b/src/compat/cvc3_compat.cpp @@ -25,9 +25,11 @@ #include "base/exception.h" #include "base/output.h" +#include "expr/expr_iomanip.h" #include "expr/kind.h" #include "expr/predicate.h" #include "expr/sexpr.h" +#include "options/base_options.h" #include "options/expr_options.h" #include "options/parser_options.h" #include "options/set_language.h" @@ -1560,8 +1562,8 @@ void ValidityChecker::printExpr(const Expr& e) { } void ValidityChecker::printExpr(const Expr& e, std::ostream& os) { - Expr::setdepth::Scope sd(os, -1); - Expr::printtypes::Scope pt(os, false); + CVC4::expr::ExprSetDepth::Scope sd(os, -1); + CVC4::expr::ExprPrintTypes::Scope pt(os, false); CVC4::language::SetLanguage::Scope sl(os, d_em->getOptions()[CVC4::options::outputLanguage]); os << e; } |