From a3594145ad58402b13889a37bd0b2f16a5103b99 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Mon, 31 Oct 2016 17:35:54 +0200 Subject: [PATCH] Fix the inequality operator from the Slot class. Remove unnecessary implementation of other comparison operators from the slot class. --- source/Misc/Signal.hpp | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/source/Misc/Signal.hpp b/source/Misc/Signal.hpp index bde3bbd6..13536acc 100644 --- a/source/Misc/Signal.hpp +++ b/source/Misc/Signal.hpp @@ -231,39 +231,7 @@ private: */ bool operator != (const Slot & o) const { - return (mEnvHash != o.mEnvHash) && (mFuncHash != o.mFuncHash); - } - - /* ---------------------------------------------------------------------------------------- - * Less than comparison operator. - */ - bool operator < (const Slot & o) const - { - return (mEnvHash < o.mEnvHash) && (mFuncHash < o.mFuncHash); - } - - /* ---------------------------------------------------------------------------------------- - * Greater than comparison operator. - */ - bool operator > (const Slot & o) const - { - return (mEnvHash > o.mEnvHash) && (mFuncHash > o.mFuncHash); - } - - /* ---------------------------------------------------------------------------------------- - * Less than or equal comparison operator. - */ - bool operator <= (const Slot & o) const - { - return (mEnvHash <= o.mEnvHash) && (mFuncHash <= o.mFuncHash); - } - - /* ---------------------------------------------------------------------------------------- - * Greater than or equal comparison operator. - */ - bool operator >= (const Slot & o) const - { - return (mEnvHash >= o.mEnvHash) && (mFuncHash >= o.mFuncHash); + return (mEnvHash != o.mEnvHash) || (mFuncHash != o.mFuncHash); } /* ----------------------------------------------------------------------------------------