diff options
author | Aina Niemetz <aina.niemetz@gmail.com> | 2021-04-09 17:22:07 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-09 17:22:07 -0700 |
commit | f87f038c5f0821d0fefb01cea00bfdec6004da91 (patch) | |
tree | d948178e1c0d2dc459a976f0d187d2d41a5437c0 /src/smt | |
parent | 550c49a7dd2b13ea29743458336f0c0a0fb6099a (diff) |
Rename CVC4_ macros to CVC5_. (#6327)
Diffstat (limited to 'src/smt')
-rw-r--r-- | src/smt/dump.cpp | 4 | ||||
-rw-r--r-- | src/smt/dump.h | 4 | ||||
-rw-r--r-- | src/smt/listeners.cpp | 2 | ||||
-rw-r--r-- | src/smt/managed_ostreams.cpp | 6 | ||||
-rw-r--r-- | src/smt/set_defaults.cpp | 4 | ||||
-rw-r--r-- | src/smt/smt_engine_state.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/smt/dump.cpp b/src/smt/dump.cpp index c1daf9879..73f26dc92 100644 --- a/src/smt/dump.cpp +++ b/src/smt/dump.cpp @@ -26,7 +26,7 @@ namespace cvc5 { -#if defined(CVC4_DUMPING) && !defined(CVC4_MUZZLE) +#if defined(CVC5_DUMPING) && !defined(CVC5_MUZZLE) CVC4dumpstream& CVC4dumpstream::operator<<(const Command& c) { @@ -54,7 +54,7 @@ CVC4dumpstream& CVC4dumpstream::operator<<(const NodeCommand& nc) return *this; } -#endif /* CVC4_DUMPING && !CVC4_MUZZLE */ +#endif /* CVC5_DUMPING && !CVC5_MUZZLE */ DumpC DumpChannel; diff --git a/src/smt/dump.h b/src/smt/dump.h index 9aeb771dc..6e14fc59f 100644 --- a/src/smt/dump.h +++ b/src/smt/dump.h @@ -26,7 +26,7 @@ namespace cvc5 { class Command; class NodeCommand; -#if defined(CVC4_DUMPING) && !defined(CVC4_MUZZLE) +#if defined(CVC5_DUMPING) && !defined(CVC5_MUZZLE) class CVC4dumpstream { @@ -62,7 +62,7 @@ class CVC4dumpstream CVC4dumpstream& operator<<(const NodeCommand& nc); }; /* class CVC4dumpstream */ -#endif /* CVC4_DUMPING && !CVC4_MUZZLE */ +#endif /* CVC5_DUMPING && !CVC5_MUZZLE */ /** The dump class */ class DumpC diff --git a/src/smt/listeners.cpp b/src/smt/listeners.cpp index e322531a7..e7ea9bb40 100644 --- a/src/smt/listeners.cpp +++ b/src/smt/listeners.cpp @@ -71,7 +71,7 @@ void SmtNodeManagerListener::nmNotifyNewDatatypes( { if (Configuration::isAssertionBuild()) { - for (CVC4_UNUSED const TypeNode& dt : dtts) + for (CVC5_UNUSED const TypeNode& dt : dtts) { Assert(dt.isDatatype()); } diff --git a/src/smt/managed_ostreams.cpp b/src/smt/managed_ostreams.cpp index 09b454cf2..6962ef495 100644 --- a/src/smt/managed_ostreams.cpp +++ b/src/smt/managed_ostreams.cpp @@ -71,13 +71,13 @@ std::string ManagedDumpOStream::defaultSource() const{ void ManagedDumpOStream::initialize(std::ostream* outStream) { -#ifdef CVC4_DUMPING +#ifdef CVC5_DUMPING DumpOstreamUpdate dumpGetStream; dumpGetStream.apply(outStream); -#else /* CVC4_DUMPING */ +#else /* CVC5_DUMPING */ throw OptionException( "The dumping feature was disabled in this build of CVC4."); -#endif /* CVC4_DUMPING */ +#endif /* CVC5_DUMPING */ } void ManagedDumpOStream::addSpecialCases(OstreamOpener* opener) const { diff --git a/src/smt/set_defaults.cpp b/src/smt/set_defaults.cpp index 6c10eeb94..6a5ed52d0 100644 --- a/src/smt/set_defaults.cpp +++ b/src/smt/set_defaults.cpp @@ -1453,7 +1453,7 @@ void setDefaults(LogicInfo& logic, bool isInternalSubsolver) if (logic == LogicInfo("QF_UFNRA")) { -#ifdef CVC4_USE_POLY +#ifdef CVC5_USE_POLY if (!options::nlCad() && !options::nlCad.wasSetByUser()) { options::nlCad.set(true); @@ -1468,7 +1468,7 @@ void setDefaults(LogicInfo& logic, bool isInternalSubsolver) } #endif } -#ifndef CVC4_USE_POLY +#ifndef CVC5_USE_POLY if (options::nlCad()) { if (options::nlCad.wasSetByUser()) diff --git a/src/smt/smt_engine_state.cpp b/src/smt/smt_engine_state.cpp index b33f1e13c..c8f23f7f8 100644 --- a/src/smt/smt_engine_state.cpp +++ b/src/smt/smt_engine_state.cpp @@ -96,7 +96,7 @@ void SmtEngineState::notifyCheckSatResult(bool hasAssumptions, Result r) if (!d_expectedStatus.isUnknown() && !d_status.isUnknown() && d_status != d_expectedStatus) { - CVC4_FATAL() << "Expected result " << d_expectedStatus << " but got " + CVC5_FATAL() << "Expected result " << d_expectedStatus << " but got " << d_status; } // clear expected status |