Pass ostream instead of using cout in natural_loops

src/analyses/natural_loops.cpp

@@ -11,18 +11,18 @@ Author: Georg Weissenbacher, [email protected]
 
 #include "natural_loops.h"
 
-#include <iostream>
-
-void show_natural_loops(const goto_modelt &goto_model)
+void show_natural_loops(
+  const goto_modelt &goto_model,
+  std::ostream &out)
 {
   forall_goto_functions(it, goto_model.goto_functions)
   {
-    std::cout << "*** " << it->first << '\n';
+    out << "*** " << it->first << '\n';
 
     natural_loopst natural_loops;
     natural_loops(it->second.body);
-    natural_loops.output(std::cout);
+    natural_loops.output(out);
 
-    std::cout << '\n';
+    out << '\n';
   }
 }

src/analyses/natural_loops.h

@@ -69,7 +69,9 @@ class natural_loopst:
 typedef natural_loops_templatet<goto_programt, goto_programt::targett>
     natural_loops_mutablet;
 
-void show_natural_loops(const goto_modelt &);
+void show_natural_loops(
+  const goto_modelt &,
+  std::ostream &out);
 
 /// Finds all back-edges and computes the natural loops
 #ifdef DEBUG

src/goto-instrument/goto_instrument_parse_options.cpp

@@ -564,7 +564,7 @@ int goto_instrument_parse_optionst::doit()
 
     if(cmdline.isset("show-natural-loops"))
     {
-      show_natural_loops(goto_model);
+      show_natural_loops(goto_model, std::cout);
       return 0;
     }