From fa7f30a4ba08afe066604daee87006b4fb5f21f7 Mon Sep 17 00:00:00 2001
From: Tim King <taking@google.com>
Date: Wed, 30 Dec 2015 11:45:37 -0800
Subject: 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.

---
 examples/hashsmt/sha1_collision.cpp | 1 +
 examples/hashsmt/sha1_inversion.cpp | 1 +
 examples/hashsmt/word.cpp           | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'examples/hashsmt')

diff --git a/examples/hashsmt/sha1_collision.cpp b/examples/hashsmt/sha1_collision.cpp
index 9ed4424ba..984cbde13 100644
--- a/examples/hashsmt/sha1_collision.cpp
+++ b/examples/hashsmt/sha1_collision.cpp
@@ -28,6 +28,7 @@
 #include <sstream>
 #include <string>
 
+#include "expr/expr_iomanip.h"
 #include "options/language.h"
 #include "options/set_language.h"
 #include "sha1.hpp"
diff --git a/examples/hashsmt/sha1_inversion.cpp b/examples/hashsmt/sha1_inversion.cpp
index 15c7d8728..9aac7bbe0 100644
--- a/examples/hashsmt/sha1_inversion.cpp
+++ b/examples/hashsmt/sha1_inversion.cpp
@@ -28,6 +28,7 @@
 #include <sstream>
 #include <string>
 
+#include "expr/expr_iomanip.h"
 #include "options/language.h"
 #include "options/set_language.h"
 #include "sha1.hpp"
diff --git a/examples/hashsmt/word.cpp b/examples/hashsmt/word.cpp
index 2e638f64f..7aa37e91b 100644
--- a/examples/hashsmt/word.cpp
+++ b/examples/hashsmt/word.cpp
@@ -26,6 +26,12 @@
 
 #include <vector>
 
+#include "expr/expr.h"
+#include "expr/expr_iomanip.h"
+#include "options/base_options.h"
+#include "options/language.h"
+#include "options/options.h"
+
 using namespace std;
 using namespace hashsmt;
 using namespace CVC4;
@@ -66,7 +72,7 @@ Word Word::concat(const Word words[], unsigned size) {
 }
 
 void Word::print(ostream& out) const {
-  out << CVC4::Expr::setdepth(-1) << d_expr;
+  out << CVC4::expr::ExprSetDepth(-1) << d_expr;
 }
 
 Word::Word(unsigned newSize, unsigned value) {
-- 
cgit v1.2.3