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/theory/arrays | |
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/theory/arrays')
-rw-r--r-- | src/theory/arrays/theory_arrays.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/theory/arrays/theory_arrays.cpp b/src/theory/arrays/theory_arrays.cpp index d721b7e7a..dcf82e6b4 100644 --- a/src/theory/arrays/theory_arrays.cpp +++ b/src/theory/arrays/theory_arrays.cpp @@ -1476,18 +1476,21 @@ void TheoryArrays::check(Effort e) { mayRep = d_mayEqualEqualityEngine.getRepresentative(r[0]); iRep = d_equalityEngine.getRepresentative(r[1]); std::pair<TNode, TNode> key(mayRep, iRep); - ReadBucketMap::iterator it = d_readBucketTable.find(key); - if (it == d_readBucketTable.end()) { + ReadBucketMap::iterator rbm_it = d_readBucketTable.find(key); + if (rbm_it == d_readBucketTable.end()) + { bucketList = new(true) CTNodeList(d_readTableContext); d_readBucketAllocations.push_back(bucketList); d_readBucketTable[key] = bucketList; } else { - bucketList = it->second; + bucketList = rbm_it->second; } - CTNodeList::const_iterator it2 = bucketList->begin(), iend = bucketList->end(); - for (; it2 != iend; ++it2) { - const TNode& r2 = *it2; + CTNodeList::const_iterator ctnl_it = bucketList->begin(), + ctnl_iend = bucketList->end(); + for (; ctnl_it != ctnl_iend; ++ctnl_it) + { + const TNode& r2 = *ctnl_it; Assert(r2.getKind() == kind::SELECT); Assert(mayRep == d_mayEqualEqualityEngine.getRepresentative(r2[0])); Assert(iRep == d_equalityEngine.getRepresentative(r2[1])); |