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/care_graph.h | |
parent | 4b7de240edeee362a0b9ca440c22a8b0744cf34b (diff) |
Initial work towards -Wshadow (#3817)
Diffstat (limited to 'src/theory/care_graph.h')
-rw-r--r-- | src/theory/care_graph.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/theory/care_graph.h b/src/theory/care_graph.h index 55851c1a4..f17f67ee0 100644 --- a/src/theory/care_graph.h +++ b/src/theory/care_graph.h @@ -31,22 +31,25 @@ namespace theory { * A (ordered) pair of terms a theory cares about. */ struct CarePair { - const TNode a, b; - const TheoryId theory; + const TNode d_a, d_b; + const TheoryId d_theory; CarePair(TNode a, TNode b, TheoryId theory) - : a(a < b ? a : b), b(a < b ? b : a), theory(theory) {} + : d_a(a < b ? a : b), d_b(a < b ? b : a), d_theory(theory) + { + } bool operator==(const CarePair& other) const { - return (theory == other.theory) && (a == other.a) && (b == other.b); + return (d_theory == other.d_theory) && (d_a == other.d_a) + && (d_b == other.d_b); } bool operator<(const CarePair& other) const { - if (theory < other.theory) return true; - if (theory > other.theory) return false; - if (a < other.a) return true; - if (a > other.a) return false; - return b < other.b; + if (d_theory < other.d_theory) return true; + if (d_theory > other.d_theory) return false; + if (d_a < other.d_a) return true; + if (d_a > other.d_a) return false; + return d_b < other.d_b; } }; /* struct CarePair */ |