diff options
| author | Gereon Kremer <nafur42@gmail.com> | 2021-09-08 11:59:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 18:59:53 +0000 |
| commit | a50655ea2637e114190de505a6c33cff25f5f6a5 (patch) | |
| tree | 057a2fe3949fce12ef91963eaa53fd85e834c54b | |
| parent | 54148758dba8e3523fa1c746922692d8ad3df6e8 (diff) | |
A couple of minor cleanups (#7141)
This PR does a couple of minor cleanups related to options.
| -rw-r--r-- | src/options/managed_streams.cpp | 4 | ||||
| -rw-r--r-- | src/options/managed_streams.h | 2 | ||||
| -rw-r--r-- | src/smt/command.cpp | 4 | ||||
| -rw-r--r-- | src/smt/command.h | 2 | ||||
| -rw-r--r-- | test/api/smt2_compliance.cpp | 1 |
5 files changed, 2 insertions, 11 deletions
diff --git a/src/options/managed_streams.cpp b/src/options/managed_streams.cpp index 5053db9a8..81bb242cf 100644 --- 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 f6fddc064..56bb21c2e 100644 --- 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 008d7a6d8..522c38040 100644 --- 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 627cb13c9..7d2d9cfc4 100644 --- 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 d7ce1bfc1..83c3833d1 100644 --- 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" |