From d4f39e636e6f53869286ba33900950df408a6398 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Fri, 29 Jul 2016 18:00:10 +0300 Subject: [PATCH] Fix the inequality operator in basic types. --- source/Base/AABB.cpp | 2 +- source/Base/Circle.cpp | 2 +- source/Base/Color3.cpp | 2 +- source/Base/Color4.cpp | 2 +- source/Base/Quaternion.cpp | 2 +- source/Base/Sphere.cpp | 2 +- source/Base/Vector2.cpp | 2 +- source/Base/Vector2i.cpp | 2 +- source/Base/Vector3.cpp | 2 +- source/Base/Vector4.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/Base/AABB.cpp b/source/Base/AABB.cpp index 11d4897e..86c0c4ac 100644 --- a/source/Base/AABB.cpp +++ b/source/Base/AABB.cpp @@ -276,7 +276,7 @@ bool AABB::operator == (const AABB & b) const // ------------------------------------------------------------------------------------------------ bool AABB::operator != (const AABB & b) const { - return (min != b.min) && (max != b.max); + return (min != b.min) || (max != b.max); } // ------------------------------------------------------------------------------------------------ diff --git a/source/Base/Circle.cpp b/source/Base/Circle.cpp index fa356546..eb5e379d 100644 --- a/source/Base/Circle.cpp +++ b/source/Base/Circle.cpp @@ -323,7 +323,7 @@ bool Circle::operator == (const Circle & c) const // ------------------------------------------------------------------------------------------------ bool Circle::operator != (const Circle & c) const { - return !EpsEq(rad, c.rad) && (pos != c.pos); + return !EpsEq(rad, c.rad) || (pos != c.pos); } // ------------------------------------------------------------------------------------------------ diff --git a/source/Base/Color3.cpp b/source/Base/Color3.cpp index 84e22360..fbc01e0b 100644 --- a/source/Base/Color3.cpp +++ b/source/Base/Color3.cpp @@ -444,7 +444,7 @@ bool Color3::operator == (const Color3 & c) const // ------------------------------------------------------------------------------------------------ bool Color3::operator != (const Color3 & c) const { - return (r != c.r) && (g != c.g) && (b != c.b); + return (r != c.r) || (g != c.g) || (b != c.b); } // ------------------------------------------------------------------------------------------------ diff --git a/source/Base/Color4.cpp b/source/Base/Color4.cpp index 208ffb87..3e058f31 100644 --- a/source/Base/Color4.cpp +++ b/source/Base/Color4.cpp @@ -469,7 +469,7 @@ bool Color4::operator == (const Color4 & c) const // ------------------------------------------------------------------------------------------------ bool Color4::operator != (const Color4 & c) const { - return (r != c.r) && (g != c.g) && (b != c.b) && (a != c.a); + return (r != c.r) || (g != c.g) || (b != c.b) || (a != c.a); } // ------------------------------------------------------------------------------------------------ diff --git a/source/Base/Quaternion.cpp b/source/Base/Quaternion.cpp index 1422facd..13f6dab4 100644 --- a/source/Base/Quaternion.cpp +++ b/source/Base/Quaternion.cpp @@ -308,7 +308,7 @@ bool Quaternion::operator == (const Quaternion & q) const // ------------------------------------------------------------------------------------------------ bool Quaternion::operator != (const Quaternion & q) const { - return !EpsEq(x, q.x) && !EpsEq(y, q.y) && !EpsEq(z, q.z) && !EpsEq(w, q.w); + return !EpsEq(x, q.x) || !EpsEq(y, q.y) || !EpsEq(z, q.z) || !EpsEq(w, q.w); } // ------------------------------------------------------------------------------------------------ diff --git a/source/Base/Sphere.cpp b/source/Base/Sphere.cpp index 7a30169b..0b574ae6 100644 --- a/source/Base/Sphere.cpp +++ b/source/Base/Sphere.cpp @@ -323,7 +323,7 @@ bool Sphere::operator == (const Sphere & s) const // ------------------------------------------------------------------------------------------------ bool Sphere::operator != (const Sphere & s) const { - return !EpsEq(rad, s.rad) && (pos != s.pos); + return !EpsEq(rad, s.rad) || (pos != s.pos); } // ------------------------------------------------------------------------------------------------ diff --git a/source/Base/Vector2.cpp b/source/Base/Vector2.cpp index 692402d5..126f8b43 100644 --- a/source/Base/Vector2.cpp +++ b/source/Base/Vector2.cpp @@ -265,7 +265,7 @@ bool Vector2::operator == (const Vector2 & v) const // ------------------------------------------------------------------------------------------------ bool Vector2::operator != (const Vector2 & v) const { - return !EpsEq(x, v.x) && !EpsEq(y, v.y); + return !EpsEq(x, v.x) || !EpsEq(y, v.y); } // ------------------------------------------------------------------------------------------------ diff --git a/source/Base/Vector2i.cpp b/source/Base/Vector2i.cpp index 7a46dbcd..0bcdcf8f 100644 --- a/source/Base/Vector2i.cpp +++ b/source/Base/Vector2i.cpp @@ -411,7 +411,7 @@ bool Vector2i::operator == (const Vector2i & v) const // ------------------------------------------------------------------------------------------------ bool Vector2i::operator != (const Vector2i & v) const { - return (x != v.x) && (y != v.y); + return (x != v.x) || (y != v.y); } // ------------------------------------------------------------------------------------------------ diff --git a/source/Base/Vector3.cpp b/source/Base/Vector3.cpp index 4de381d7..28bf9ca1 100644 --- a/source/Base/Vector3.cpp +++ b/source/Base/Vector3.cpp @@ -284,7 +284,7 @@ bool Vector3::operator == (const Vector3 & v) const // ------------------------------------------------------------------------------------------------ bool Vector3::operator != (const Vector3 & v) const { - return !EpsEq(x, v.x) && !EpsEq(y, v.y) && !EpsEq(z, v.z); + return !EpsEq(x, v.x) || !EpsEq(y, v.y) || !EpsEq(z, v.z); } // ------------------------------------------------------------------------------------------------ diff --git a/source/Base/Vector4.cpp b/source/Base/Vector4.cpp index a603a1b2..db8c1bf1 100644 --- a/source/Base/Vector4.cpp +++ b/source/Base/Vector4.cpp @@ -307,7 +307,7 @@ bool Vector4::operator == (const Vector4 & v) const // ------------------------------------------------------------------------------------------------ bool Vector4::operator != (const Vector4 & v) const { - return !EpsEq(x, v.x) && !EpsEq(y, v.y) && !EpsEq(z, v.z) && !EpsEq(w, v.w); + return !EpsEq(x, v.x) || !EpsEq(y, v.y) || !EpsEq(z, v.z) || !EpsEq(w, v.w); } // ------------------------------------------------------------------------------------------------