From 6869e0b801b610e3eadecf3bd22b86118158f475 Mon Sep 17 00:00:00 2001 From: Jakub Pawlewicz Date: Sat, 28 May 2011 20:17:14 +0200 Subject: [PATCH 2/3] Fixed comparison operators in tuples --- uppsrc/Core/Tuple.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/uppsrc/Core/Tuple.h b/uppsrc/Core/Tuple.h index 2d7f9ce..f590676 100644 --- a/uppsrc/Core/Tuple.h +++ b/uppsrc/Core/Tuple.h @@ -9,8 +9,8 @@ struct Tuple2 { int Compare(const Tuple2& x) const { return CombineCompare(a, x.a)(b, x.b); } bool operator<=(const Tuple2& x) const { return Compare(x) <= 0; } bool operator>=(const Tuple2& x) const { return Compare(x) >= 0; } - bool operator<(const Tuple2& x) const { return Compare(x) != 0; } - bool operator>(const Tuple2& x) const { return Compare(x) != 0; } + bool operator<(const Tuple2& x) const { return Compare(x) < 0; } + bool operator>(const Tuple2& x) const { return Compare(x) > 0; } unsigned GetHashValue() const { return CombineHash(a, b); } @@ -45,8 +45,8 @@ struct Tuple3 { int Compare(const Tuple3& x) const { return CombineCompare(a, x.a)(b, x.b)(c, x.c); } bool operator<=(const Tuple3& x) const { return Compare(x) <= 0; } bool operator>=(const Tuple3& x) const { return Compare(x) >= 0; } - bool operator<(const Tuple3& x) const { return Compare(x) != 0; } - bool operator>(const Tuple3& x) const { return Compare(x) != 0; } + bool operator<(const Tuple3& x) const { return Compare(x) < 0; } + bool operator>(const Tuple3& x) const { return Compare(x) > 0; } unsigned GetHashValue() const { return CombineHash(a, b, c); } @@ -84,8 +84,8 @@ struct Tuple4 { int Compare(const Tuple4& x) const { return CombineCompare(a, x.a)(b, x.b)(c, x.c)(d, x.d); } bool operator<=(const Tuple4& x) const { return Compare(x) <= 0; } bool operator>=(const Tuple4& x) const { return Compare(x) >= 0; } - bool operator<(const Tuple4& x) const { return Compare(x) != 0; } - bool operator>(const Tuple4& x) const { return Compare(x) != 0; } + bool operator<(const Tuple4& x) const { return Compare(x) < 0; } + bool operator>(const Tuple4& x) const { return Compare(x) > 0; } unsigned GetHashValue() const { return CombineHash(a, b, c, d); } -- 1.7.4.1