message_streamt -> legacy_message_streamt

Author: kroening

src/util/message_stream.cpp

@@ -13,7 +13,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 /*******************************************************************\
 
-Function: message_streamt::error_parse_line
+Function: legacy_message_streamt::error_parse_line
 
   Inputs:
 
@@ -23,7 +23,7 @@ Function: message_streamt::error_parse_line
 
 \*******************************************************************/
 
-void message_streamt::error_parse_line(
+void legacy_message_streamt::error_parse_line(
   unsigned level,
   const std::string &line)
 {
@@ -144,7 +144,7 @@ void message_streamt::error_parse_line(
 
 /*******************************************************************\
 
-Function: message_streamt::error_parse
+Function: legacy_message_streamt::error_parse
 
   Inputs:
 
@@ -154,7 +154,7 @@ Function: message_streamt::error_parse
 
 \*******************************************************************/
 
-void message_streamt::error_parse(
+void legacy_message_streamt::error_parse(
   unsigned level,
   const std::string &error)
 {

src/util/message_stream.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 \*******************************************************************/
 
-#ifndef CPROVER_ERROR_HANDLER_H
-#define CPROVER_ERROR_HANDLER_H
+#ifndef CPROVER_MESSAGE_STREAM_H
+#define CPROVER_MESSAGE_STREAM_H
 
 #include <sstream>
 
@@ -16,18 +16,18 @@ Author: Daniel Kroening, kroening@kroening.com
 
 // deprecated; use warning(), error(), etc. streams in messaget
 
-class message_streamt:public message_clientt
+class legacy_message_streamt:public message_clientt
 {
 public:
-  message_streamt(message_handlert &_message_handler):
+  legacy_message_streamt(message_handlert &_message_handler):
     message_clientt(_message_handler),
     error_found(false),
     saved_error_location(static_cast<const source_locationt &>(get_nil_irep())),
     sequence_number(1)
   {
   }
 
-  virtual ~message_streamt() { }
+  virtual ~legacy_message_streamt() { }
 
   // overload to use language specific syntax
   virtual std::string to_string(const exprt &expr) { return expr.pretty(); }

src/util/typecheck.h

@@ -11,11 +11,11 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "message_stream.h"
 
-class legacy_typecheckt:public message_streamt
+class legacy_typecheckt:public legacy_message_streamt
 {
 public:
   legacy_typecheckt(message_handlert &_message_handler):
-    message_streamt(_message_handler) { }
+    legacy_message_streamt(_message_handler) { }
   virtual ~legacy_typecheckt() { }
 
 protected: