Merge pull request #5565 from tautschnig/remove-deprecated-unwindset

Remove deprecated variant of parse_unwindset

Author: tautschnig

src/goto-instrument/unwindset.cpp

@@ -54,19 +54,16 @@ void unwindsett::parse_unwindset_one_loop(std::string val)
   }
 }
 
-void unwindsett::parse_unwindset(const std::string &unwindset)
-{
-  std::vector<std::string> unwindset_elements =
-    split_string(unwindset, ',', true, true);
-
-  for(auto &element : unwindset_elements)
-    parse_unwindset_one_loop(element);
-}
-
 void unwindsett::parse_unwindset(const std::list<std::string> &unwindset)
 {
   for(auto &element : unwindset)
-    parse_unwindset(element);
+  {
+    std::vector<std::string> unwindset_elements =
+      split_string(element, ',', true, true);
+
+    for(auto &element : unwindset_elements)
+      parse_unwindset_one_loop(element);
+  }
 }
 
 optionalt<unsigned>
@@ -104,5 +101,10 @@ void unwindsett::parse_unwindset_file(const std::string &file_name)
 
   std::stringstream buffer;
   buffer << file.rdbuf();
-  parse_unwindset(buffer.str());
+
+  std::vector<std::string> unwindset_elements =
+    split_string(buffer.str(), ',', true, true);
+
+  for(auto &element : unwindset_elements)
+    parse_unwindset_one_loop(element);
 }

src/goto-instrument/unwindset.h

@@ -16,7 +16,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <map>
 #include <string>
 
-#include <util/deprecate.h>
 #include <util/irep.h>
 #include <util/optional.h>
 
@@ -32,10 +31,6 @@ class unwindsett
   // global limit for all loops
   void parse_unwind(const std::string &unwind);
 
-  // limit for instances of a loop
-  DEPRECATED(SINCE(2019, 11, 15, "use parse_unwindset(list) instead"))
-  void parse_unwindset(const std::string &unwindset);
-
   // limit for instances of a loop
   void parse_unwindset(const std::list<std::string> &unwindset);