Merging main/getopt.cpp, main/usage.h, and smt/options.h in

util/options.h,cpp

3 files changed, 6 insertions, 7 deletions

diff --git a/test/unit/prop/cnf_stream_black.h b/test/unit/prop/cnf_stream_black.h
index b340beb50..cee8a6a64 100644
--- a/test/unit/prop/cnf_stream_black.h
+++ b/test/unit/prop/cnf_stream_black.h
@@ -30,7 +30,6 @@
 #include "prop/prop_engine.h"
 #include "prop/sat.h"
 #include "smt/smt_engine.h"
-#include "smt/options.h"
 #include "util/decision_engine.h"
 
 using namespace CVC4;
diff --git a/test/unit/theory/shared_term_manager_black.h b/test/unit/theory/shared_term_manager_black.h
index 5007f43ed..7340f6ae7 100644
--- a/test/unit/theory/shared_term_manager_black.h
+++ b/test/unit/theory/shared_term_manager_black.h
@@ -31,7 +31,7 @@
 #include "context/context.h"
 #include "util/rational.h"
 #include "util/integer.h"
-#include "smt/options.h"
+#include "util/options.h"
 #include "util/Assert.h"
 
 using namespace CVC4;
@@ -51,7 +51,6 @@ class SharedTermManagerBlack : public CxxTest::TestSuite {
   NodeManager* d_nm;
   NodeManagerScope* d_scope;
   TheoryEngine* d_theoryEngine;
-  Options d_options;
 
 public:
 
@@ -61,7 +60,8 @@ public:
     d_nm = new NodeManager(d_ctxt);
     d_scope = new NodeManagerScope(d_nm);
 
-    d_theoryEngine = new TheoryEngine(d_ctxt, d_options);
+    Options options;
+    d_theoryEngine = new TheoryEngine(d_ctxt, options);
   }
 
   void tearDown() {
diff --git a/test/unit/theory/theory_engine_white.h b/test/unit/theory/theory_engine_white.h
index 00766ec90..bd6ec515b 100644
--- a/test/unit/theory/theory_engine_white.h
+++ b/test/unit/theory/theory_engine_white.h
@@ -35,7 +35,7 @@
 #include "context/context.h"
 #include "util/rational.h"
 #include "util/integer.h"
-#include "smt/options.h"
+#include "util/options.h"
 #include "util/Assert.h"
 
 using namespace CVC4;
@@ -227,7 +227,6 @@ class TheoryEngineWhite : public CxxTest::TestSuite {
   FakeOutputChannel *d_nullChannel;
   FakeTheory *d_builtin, *d_bool, *d_uf, *d_arith, *d_arrays, *d_bv;
   TheoryEngine* d_theoryEngine;
-  Options d_options;
 
 public:
 
@@ -248,7 +247,8 @@ public:
     d_bv = new FakeTheory(d_ctxt, *d_nullChannel, "BV");
 
     // create the TheoryEngine
-    d_theoryEngine = new TheoryEngine(d_ctxt, d_options);
+    Options options;
+    d_theoryEngine = new TheoryEngine(d_ctxt, options);
 
     // insert our fake versions into the TheoryEngine's theoryOf table
     d_theoryEngine->d_theoryOfTable.