Skip to content

Commit 89e8cc0

Browse files
committed
Remove deprecated variant of parse_unwindset
The remaining use of the deprecated variant was updated accordingly.
1 parent ff1e81e commit 89e8cc0

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

src/goto-instrument/unwindset.cpp

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,10 @@ void unwindsett::parse_unwindset_one_loop(std::string val)
5454
}
5555
}
5656

57-
void unwindsett::parse_unwindset(const std::string &unwindset)
58-
{
59-
std::vector<std::string> unwindset_elements =
60-
split_string(unwindset, ',', true, true);
61-
62-
for(auto &element : unwindset_elements)
63-
parse_unwindset_one_loop(element);
64-
}
65-
6657
void unwindsett::parse_unwindset(const std::list<std::string> &unwindset)
6758
{
6859
for(auto &element : unwindset)
69-
parse_unwindset(element);
60+
parse_unwindset_one_loop(element);
7061
}
7162

7263
optionalt<unsigned>
@@ -104,5 +95,10 @@ void unwindsett::parse_unwindset_file(const std::string &file_name)
10495

10596
std::stringstream buffer;
10697
buffer << file.rdbuf();
107-
parse_unwindset(buffer.str());
98+
99+
std::vector<std::string> unwindset_elements =
100+
split_string(buffer.str(), ',', true, true);
101+
102+
for(auto &element : unwindset_elements)
103+
parse_unwindset_one_loop(element);
108104
}

src/goto-instrument/unwindset.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Author: Daniel Kroening, [email protected]
1616
#include <map>
1717
#include <string>
1818

19-
#include <util/deprecate.h>
2019
#include <util/irep.h>
2120
#include <util/optional.h>
2221

@@ -32,10 +31,6 @@ class unwindsett
3231
// global limit for all loops
3332
void parse_unwind(const std::string &unwind);
3433

35-
// limit for instances of a loop
36-
DEPRECATED(SINCE(2019, 11, 15, "use parse_unwindset(list) instead"))
37-
void parse_unwindset(const std::string &unwindset);
38-
3934
// limit for instances of a loop
4035
void parse_unwindset(const std::list<std::string> &unwindset);
4136

0 commit comments

Comments
 (0)