diff options
| author | Aina Niemetz <aina.niemetz@gmail.com> | 2020-12-02 14:24:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 14:24:52 -0800 |
| commit | a9eaeb438882abd6d06be41c6fcb87f4f04bcc8c (patch) | |
| tree | af6188637ea86feb9f6bc6595740a2d5129893fb /src/smt | |
| parent | 768157d3bf78337a603004a2a47026ecf1b70612 (diff) | |
Rename macro Message to CVC4Message. (#5576)
Diffstat (limited to 'src/smt')
| -rw-r--r-- | src/smt/managed_ostreams.cpp | 5 | ||||
| -rw-r--r-- | src/smt/options_manager.cpp | 6 | ||||
| -rw-r--r-- | src/smt/update_ostream.h | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/smt/managed_ostreams.cpp b/src/smt/managed_ostreams.cpp index c49de7372..27a90cb56 100644 --- a/src/smt/managed_ostreams.cpp +++ b/src/smt/managed_ostreams.cpp @@ -122,8 +122,9 @@ ManagedDiagnosticOutputChannel::~ManagedDiagnosticOutputChannel() { if(Warning.getStreamPointer() == getManagedOstream()){ Warning.setStream(&null_os); } - if(Message.getStreamPointer() == getManagedOstream()){ - Message.setStream(&null_os); + if (CVC4Message.getStreamPointer() == getManagedOstream()) + { + CVC4Message.setStream(&null_os); } if(Notice.getStreamPointer() == getManagedOstream()){ Notice.setStream(&null_os); diff --git a/src/smt/options_manager.cpp b/src/smt/options_manager.cpp index 81e13c446..e028068ee 100644 --- a/src/smt/options_manager.cpp +++ b/src/smt/options_manager.cpp @@ -76,7 +76,7 @@ void OptionsManager::notifySetOption(const std::string& key) Trace.getStream() << expr::ExprSetDepth(depth); Notice.getStream() << expr::ExprSetDepth(depth); Chat.getStream() << expr::ExprSetDepth(depth); - Message.getStream() << expr::ExprSetDepth(depth); + CVC4Message.getStream() << expr::ExprSetDepth(depth); Warning.getStream() << expr::ExprSetDepth(depth); // intentionally exclude Dump stream from this list } @@ -87,7 +87,7 @@ void OptionsManager::notifySetOption(const std::string& key) Trace.getStream() << expr::ExprDag(dag); Notice.getStream() << expr::ExprDag(dag); Chat.getStream() << expr::ExprDag(dag); - Message.getStream() << expr::ExprDag(dag); + CVC4Message.getStream() << expr::ExprDag(dag); Warning.getStream() << expr::ExprDag(dag); Dump.getStream() << expr::ExprDag(dag); } @@ -103,7 +103,7 @@ void OptionsManager::notifySetOption(const std::string& key) Trace.getStream() << Command::printsuccess(value); Notice.getStream() << Command::printsuccess(value); Chat.getStream() << Command::printsuccess(value); - Message.getStream() << Command::printsuccess(value); + CVC4Message.getStream() << Command::printsuccess(value); Warning.getStream() << Command::printsuccess(value); *options::out() << Command::printsuccess(value); } diff --git a/src/smt/update_ostream.h b/src/smt/update_ostream.h index e2a482e30..fd33beec7 100644 --- a/src/smt/update_ostream.h +++ b/src/smt/update_ostream.h @@ -94,8 +94,8 @@ class WarningOstreamUpdate : public OstreamUpdate { class MessageOstreamUpdate : public OstreamUpdate { public: - std::ostream& get() override { return Message.getStream(); } - void set(std::ostream* setTo) override { Message.setStream(setTo); } + std::ostream& get() override { return CVC4Message.getStream(); } + void set(std::ostream* setTo) override { CVC4Message.setStream(setTo); } }; /* class MessageOstreamUpdate */ class NoticeOstreamUpdate : public OstreamUpdate { |