use goto_modelt

git-svn-id: svn+ssh://svn.cprover.org/srv/svn/cbmc/trunk@3906 6afb6bc1-c8e4-404c-8f48-9ae832c5b171

Author: kroening

src/goto-programs/remove_returns.cpp

@@ -288,3 +288,21 @@ void remove_returns(
   rr(goto_functions);
 }
 
+/*******************************************************************\
+
+Function: remove_returns
+
+Inputs:
+
+Outputs:
+
+Purpose: removes returns
+
+\*******************************************************************/
+
+void remove_returns(goto_modelt &goto_model)
+{
+  remove_returnst rr(goto_model.symbol_table);
+  rr(goto_model.goto_functions);
+}
+

src/goto-programs/remove_returns.h

@@ -11,12 +11,10 @@ Date:   September 2009
 #ifndef CPROVER_REMOVE_RETURN_VALUES_H
 #define CPROVER_REMOVE_RETURN_VALUES_H
 
-#include <goto-programs/goto_functions.h>
+#include <goto-programs/goto_model.h>
 
-class symbol_tablet;
+void remove_returns(symbol_tablet &, goto_functionst &);
 
-void remove_returns(
-  symbol_tablet &symbol_table,
-  goto_functionst &goto_functions);
+void remove_returns(goto_modelt &);
 
 #endif