diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2020-02-26 19:11:31 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-26 19:11:31 -0600 |
commit | d41d2a817f884e0f6c8d5cb3b87b4298bc1b56f5 (patch) | |
tree | 5cfe4336c5aa40cac613238a2625b1fb4aa55d31 /src/theory/theory_engine.h | |
parent | 4b7de240edeee362a0b9ca440c22a8b0744cf34b (diff) |
Initial work towards -Wshadow (#3817)
Diffstat (limited to 'src/theory/theory_engine.h')
-rw-r--r-- | src/theory/theory_engine.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/theory/theory_engine.h b/src/theory/theory_engine.h index a5631059f..1757d7a6d 100644 --- a/src/theory/theory_engine.h +++ b/src/theory/theory_engine.h @@ -60,15 +60,17 @@ class LemmaProofRecipe; * propagations between theories. */ struct NodeTheoryPair { - Node node; - theory::TheoryId theory; - size_t timestamp; - NodeTheoryPair(TNode node, theory::TheoryId theory, size_t timestamp = 0) - : node(node), theory(theory), timestamp(timestamp) {} - NodeTheoryPair() : theory(theory::THEORY_LAST), timestamp() {} + Node d_node; + theory::TheoryId d_theory; + size_t d_timestamp; + NodeTheoryPair(TNode n, theory::TheoryId t, size_t ts = 0) + : d_node(n), d_theory(t), d_timestamp(ts) + { + } + NodeTheoryPair() : d_theory(theory::THEORY_LAST), d_timestamp() {} // Comparison doesn't take into account the timestamp bool operator == (const NodeTheoryPair& pair) const { - return node == pair.node && theory == pair.theory; + return d_node == pair.d_node && d_theory == pair.d_theory; } };/* struct NodeTheoryPair */ @@ -76,8 +78,8 @@ struct NodeTheoryPairHashFunction { NodeHashFunction hashFunction; // Hash doesn't take into account the timestamp size_t operator()(const NodeTheoryPair& pair) const { - uint64_t hash = fnv1a::fnv1a_64(NodeHashFunction()(pair.node)); - return static_cast<size_t>(fnv1a::fnv1a_64(pair.theory, hash)); + uint64_t hash = fnv1a::fnv1a_64(NodeHashFunction()(pair.d_node)); + return static_cast<size_t>(fnv1a::fnv1a_64(pair.d_theory, hash)); } };/* struct NodeTheoryPairHashFunction */ |