Merge pull request #3684 from tautschnig/vs-shadow-unit

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

Author: Daniel Kroening

unit/path_strategies.cpp

@@ -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; };
 

unit/util/range.cpp

@@ -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);