Change template parameter name to not clash with existing type

Author: NathanJPhillips

src/goto-programs/rebuild_goto_start_function.cpp

@@ -22,11 +22,11 @@
 ///   function) and symbol table (to replace the _start function symbol) of the
 ///   program.
 /// \param _message_handler: The message handler to report any messages with
-template<typename goto_modelt>
-rebuild_goto_start_function_baset<goto_modelt>::
+template<typename maybe_lazy_goto_modelt>
+rebuild_goto_start_function_baset<maybe_lazy_goto_modelt>::
 rebuild_goto_start_function_baset(
   const cmdlinet &cmdline,
-  goto_modelt &goto_model,
+  maybe_lazy_goto_modelt &goto_model,
   message_handlert &message_handler):
     messaget(message_handler),
     cmdline(cmdline),
@@ -42,8 +42,8 @@ rebuild_goto_start_function_baset(
 /// called from _start
 /// \return Returns true if either the symbol is not found, or something went
 ///   wrong with generating the start_function. False otherwise.
-template<typename goto_modelt>
-bool rebuild_goto_start_function_baset<goto_modelt>::operator()()
+template<typename maybe_lazy_goto_modelt>
+bool rebuild_goto_start_function_baset<maybe_lazy_goto_modelt>::operator()()
 {
   const irep_idt &mode=get_entry_point_mode();
 
@@ -70,9 +70,9 @@ bool rebuild_goto_start_function_baset<goto_modelt>::operator()()
 /// Find out the mode of the current entry point to determine the mode of the
 /// replacement entry point
 /// \return A mode string saying which language to use
-template<typename goto_modelt>
-irep_idt
-rebuild_goto_start_function_baset<goto_modelt>::get_entry_point_mode() const
+template<typename maybe_lazy_goto_modelt>
+irep_idt rebuild_goto_start_function_baset<maybe_lazy_goto_modelt>::
+get_entry_point_mode() const
 {
   const symbolt &current_entry_point=
     *goto_model.symbol_table.lookup(goto_functionst::entry_point());
@@ -81,9 +81,9 @@ rebuild_goto_start_function_baset<goto_modelt>::get_entry_point_mode() const
 
 /// Eliminate the existing entry point function symbol and any symbols created
 /// in that scope from the symbol table.
-template<typename goto_modelt>
-void
-rebuild_goto_start_function_baset<goto_modelt>::remove_existing_entry_point()
+template<typename maybe_lazy_goto_modelt>
+void rebuild_goto_start_function_baset<maybe_lazy_goto_modelt>::
+remove_existing_entry_point()
 {
   // Remove the function itself
   goto_model.symbol_table.remove(goto_functionst::entry_point());

src/goto-programs/rebuild_goto_start_function.h

@@ -24,13 +24,13 @@ class goto_functionst;
 #define HELP_FUNCTIONS \
   " --function name              set main function name\n"
 
-template<typename goto_modelt>
+template<typename maybe_lazy_goto_modelt>
 class rebuild_goto_start_function_baset: public messaget
 {
 public:
   rebuild_goto_start_function_baset(
     const cmdlinet &cmdline,
-    goto_modelt &goto_model,
+    maybe_lazy_goto_modelt &goto_model,
     message_handlert &message_handler);
 
   bool operator()();
@@ -41,7 +41,7 @@ class rebuild_goto_start_function_baset: public messaget
   void remove_existing_entry_point();
 
   const cmdlinet &cmdline;
-  goto_modelt &goto_model;
+  maybe_lazy_goto_modelt &goto_model;
 };
 
 // NOLINTNEXTLINE(readability/namespace)  using required for templates