Skip to content

Avoid shadowing in directory unit/ [blocks: #2310] #3684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kroening merged 2 commits into from
Jan 5, 2019
Merged

Avoid shadowing in directory unit/ [blocks: #2310] #3684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07ef750
Do not shadow "solvers"
tautschnig Dec 21, 2018
162220d
Avoid shadowing "range"
tautschnig Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions unit/path_strategies.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,9 @@ void _check_with_strategy(
ret = cbmc_parse_optionst::get_goto_program(gm, opts, cmdline, log, mh);
REQUIRE(ret == -1);

solver_factoryt solvers(opts, gm.get_symbol_table(), mh, false);
std::unique_ptr<solver_factoryt::solvert> cbmc_solver = solvers.get_solver();
solver_factoryt initial_solvers(opts, gm.get_symbol_table(), mh, false);
std::unique_ptr<solver_factoryt::solvert> cbmc_solver =
initial_solvers.get_solver();
prop_convt &initial_pc = cbmc_solver->prop_conv();
std::function<bool(void)> callback = []() { return false; };

Expand Down
4 changes: 2 additions & 2 deletions unit/util/range.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ SCENARIO("range tests", "[core][util][range]")
list.emplace_back("abc");
list.emplace_back("cdef");
list.emplace_back("acdef");
auto range = make_range(list);
std::size_t total_length = 0;
THEN("Use range-for to compute the total length")
{
auto range = make_range(list);
std::size_t total_length = 0;
for(const auto &s : range)
total_length += s.length();
REQUIRE(total_length == 12);
Expand Down