diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2020-03-05 11:42:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 11:42:54 -0800 |
| commit | 04039407e6308070c148de0d5e93640ec1b0a341 (patch) | |
| tree | b66f63d49df0713b1ca2a440bec89f1d60af32a4 /src/main | |
| parent | 18fe192c29a9a2c37d1925730af01e906b9888c5 (diff) | |
Enable -Wshadow and fix warnings. (#3909)
Fixes all -Wshadow warnings and enables the -Wshadow compile flag globally.
Co-authored-by: Clark Barrett <barrett@cs.stanford.edu>
Co-authored-by: Andres Noetzli <andres.noetzli@gmail.com>
Co-authored-by: Aina Niemetz <aina.niemetz@gmail.com>
Co-authored-by: Alex Ozdemir <aozdemir@hmc.edu>
Co-authored-by: makaimann <makaim@stanford.edu>
Co-authored-by: yoni206 <yoni206@users.noreply.github.com>
Co-authored-by: Andrew Reynolds <andrew.j.reynolds@gmail.com>
Co-authored-by: AleksandarZeljic <zeljic@stanford.edu>
Co-authored-by: Caleb Donovick <cdonovick@users.noreply.github.com>
Co-authored-by: Amalee <amaleewilson@gmail.com>
Co-authored-by: Scott Kovach <dskovach@gmail.com>
Co-authored-by: ntsis <nekuna@gmail.com>
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/driver_unified.cpp | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/src/main/driver_unified.cpp b/src/main/driver_unified.cpp index c4800a3ac..b999fe4b0 100644 --- a/src/main/driver_unified.cpp +++ b/src/main/driver_unified.cpp @@ -324,13 +324,14 @@ int runCvc4(int argc, char* argv[], Options& opts) { if (interrupted) break; for(size_t j = 0; j < allCommands[i].size() && !interrupted; ++j) { - Command* cmd = allCommands[i][j]->clone(); - cmd->setMuted(true); - pExecutor->doCommand(cmd); - if(cmd->interrupted()) { + Command* ccmd = allCommands[i][j]->clone(); + ccmd->setMuted(true); + pExecutor->doCommand(ccmd); + if (ccmd->interrupted()) + { interrupted = true; } - delete cmd; + delete ccmd; } } needReset = 0; @@ -350,13 +351,14 @@ int runCvc4(int argc, char* argv[], Options& opts) { for(size_t i = 0; i < allCommands.size() && !interrupted; ++i) { for(size_t j = 0; j < allCommands[i].size() && !interrupted; ++j) { - Command* cmd = allCommands[i][j]->clone(); - cmd->setMuted(true); - pExecutor->doCommand(cmd); - if(cmd->interrupted()) { + Command* ccmd = allCommands[i][j]->clone(); + ccmd->setMuted(true); + pExecutor->doCommand(ccmd); + if (ccmd->interrupted()) + { interrupted = true; } - delete cmd; + delete ccmd; } } if (interrupted) continue; @@ -376,13 +378,14 @@ int runCvc4(int argc, char* argv[], Options& opts) { for(size_t i = 0; i < allCommands.size() && !interrupted; ++i) { for(size_t j = 0; j < allCommands[i].size() && !interrupted; ++j) { - Command* cmd = allCommands[i][j]->clone(); - cmd->setMuted(true); - pExecutor->doCommand(cmd); - if(cmd->interrupted()) { + Command* ccmd = allCommands[i][j]->clone(); + ccmd->setMuted(true); + pExecutor->doCommand(ccmd); + if (ccmd->interrupted()) + { interrupted = true; } - delete cmd; + delete ccmd; } } needReset = 0; |