Merge branch 'issue-224' into develop

StanfordPL · Jul 29, 2018 · 505ab5e · 505ab5e
2 parents cc86c41 + 74b9c1f
commit 505ab5e
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/m.h b/src/m.h
@@ -172,18 +172,18 @@ class Mem : public Operand {
   */
   bool check() const;
 
-  /** Comparison based on on val_. */
-  constexpr bool operator<(const Mem& rhs) const {
-    return val_ < rhs.val_;
+  /** Comparison based on underlying values. */
+  bool operator==(const Mem& rhs) const {
+    return std::make_pair(val_, val2_) == std::make_pair(rhs.val_, rhs.val2_);
   }
-  /** Comparison based on on val_. */
-  constexpr bool operator==(const Mem& rhs) const {
-    return val_ == rhs.val_;
-  }
-  /** Comparison based on on val_. */
-  constexpr bool operator!=(const Mem& rhs) const {
+  /** Comparison based on underlying values. */
+  bool operator!=(const Mem& rhs) const {
     return !(*this == rhs);
   }
+  /** Comparison based on underlying values. */
+  bool operator<(const Mem& rhs) const {
+    return std::make_pair(val_, val2_) < std::make_pair(rhs.val_, rhs.val2_);
+  }
 
   /** STL-compliant hash. */
   constexpr size_t hash() const {