A couple of minor cleanups (#7141)

This PR does a couple of minor cleanups related to options.

diff --git a/src/options/managed_streams.cpp b/src/options/managed_streams.cpp
index 5053db9a8d5d73ec9df1038477130e47c25c624e..81bb242cf4d6c5ca24b3c19128adc465a0e5a27b 100644 (file)
--- a/src/options/managed_streams.cpp
+++ b/src/options/managed_streams.cpp
@@ -29,8 +29,6 @@
 
 namespace cvc5 {
 
-namespace detail {
-
 std::string cvc5_errno_failreason()
 {
 #if HAVE_STRERROR_R
@@ -72,6 +70,8 @@ std::string cvc5_errno_failreason()
 #endif /* HAVE_STRERROR_R */
 }
 
+namespace detail {
+
 std::ostream* openOStream(const std::string& filename)
 {
   errno = 0;

diff --git a/src/options/managed_streams.h b/src/options/managed_streams.h
index f6fddc064fafac2193dbcdbbb47ff1baa0779f30..56bb21c2e7070ca54dc2593b34445f9e3ece4c92 100644 (file)
--- a/src/options/managed_streams.h
+++ b/src/options/managed_streams.h
@@ -24,8 +24,6 @@
 #include <memory>
 #include <ostream>
 
-#include "options/options_public.h"
-
 namespace cvc5 {
 
 namespace detail {

diff --git a/src/smt/command.cpp b/src/smt/command.cpp
index 008d7a6d87efdd40ca555d0107f2e74b86c4cb8b..522c38040f436367bb381449e61149ec34ffdd35 100644 (file)
--- a/src/smt/command.cpp
+++ b/src/smt/command.cpp
@@ -275,10 +275,6 @@ TypeNode Command::grammarToTypeNode(api::Grammar* grammar)
                             : sortToTypeNode(grammar->resolve());
 }
 
-Options& Command::getOriginalOptionsFrom(api::Solver* s)
-{
-  return *s->d_originalOptions.get();
-}
 
 /* -------------------------------------------------------------------------- */
 /* class EmptyCommand                                                         */

diff --git a/src/smt/command.h b/src/smt/command.h
index 627cb13c953029097d393038e302c82ce39542fb..7d2d9cfc4be9230cc285a74929cec0d2725af0e0 100644 (file)
--- a/src/smt/command.h
+++ b/src/smt/command.h
@@ -299,8 +299,6 @@ class CVC5_EXPORT Command
       const std::vector<api::Sort>& sorts);
   /** Helper to convert a Grammar to an internal TypeNode */
   static TypeNode grammarToTypeNode(api::Grammar* grammar);
-  /** Get original options from the solver (for ResetCommand) */
-  Options& getOriginalOptionsFrom(api::Solver* s);
 }; /* class Command */
 
 /**

diff --git a/test/api/smt2_compliance.cpp b/test/api/smt2_compliance.cpp
index d7ce1bfc1782bc6bf55d34e2e4a72e315ceb639d..83c3833d176ce92e8d10a9b2d09853d7de875e2e 100644 (file)
--- a/test/api/smt2_compliance.cpp
+++ b/test/api/smt2_compliance.cpp
@@ -18,7 +18,6 @@
 #include <sstream>
 
 #include "api/cpp/cvc5.h"
-#include "options/options.h"
 #include "options/set_language.h"
 #include "parser/parser.h"
 #include "parser/parser_builder.h"