Merge pull request #5614 from tautschnig/messaget-remove_const_function_pointers

remove_const_function_pointerst isn't a messaget

Author: tautschnig

src/goto-programs/remove_const_function_pointers.cpp

@@ -19,12 +19,12 @@ Author: Thomas Kiley, thomas.kiley@diffblue.com
 
 #include "goto_functions.h"
 
-#define LOG(message, irep) \
-  do { \
-    debug().source_location = irep.source_location(); \
-    debug() << message << ": " << format(irep) << eom; \
-  } \
-  while(0)
+#define LOG(message, irep)                                                     \
+  do                                                                           \
+  {                                                                            \
+    log.debug().source_location = irep.source_location();                      \
+    log.debug() << message << ": " << format(irep) << messaget::eom;           \
+  } while(0)
 
 /// To take a function call on a function pointer, and if possible resolve it to
 /// a small collection of possible values.
@@ -34,10 +34,8 @@ Author: Thomas Kiley, thomas.kiley@diffblue.com
 remove_const_function_pointerst::remove_const_function_pointerst(
   message_handlert &message_handler,
   const namespacet &ns,
-  const symbol_tablet &symbol_table):
-    messaget(message_handler),
-    ns(ns),
-    symbol_table(symbol_table)
+  const symbol_tablet &symbol_table)
+  : log(message_handler), ns(ns), symbol_table(symbol_table)
 {}
 
 /// To take a function call on a function pointer, and if possible resolve it to

src/goto-programs/remove_const_function_pointers.h

@@ -29,7 +29,7 @@ class symbol_exprt;
 class symbol_tablet;
 class typecast_exprt;
 
-class remove_const_function_pointerst:public messaget
+class remove_const_function_pointerst
 {
 public:
   typedef std::unordered_set<symbol_exprt, irep_hash> functionst;
@@ -101,6 +101,7 @@ class remove_const_function_pointerst:public messaget
   exprt get_component_value(
     const struct_exprt &struct_expr, const member_exprt &member_expr);
 
+  messaget log;
   const namespacet &ns;
   const symbol_tablet &symbol_table;
 };