From f320724195e3ec045781d5331955be866c821b4f Mon Sep 17 00:00:00 2001 From: Porteries Tristan Date: Wed, 30 Dec 2015 13:27:30 +0100 Subject: BGE: Fix invalid operator< for microsoft compiler. It fixes the strict weak ordering assertion failure, see : https://support.microsoft.com/en-us/kb/949171. sybren and youle are the author of this commit. --- source/gameengine/Ketsji/KX_TouchEventManager.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source/gameengine/Ketsji/KX_TouchEventManager.cpp') diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp b/source/gameengine/Ketsji/KX_TouchEventManager.cpp index eb774960d41..7f167652464 100644 --- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp +++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp @@ -235,5 +235,12 @@ KX_TouchEventManager::NewCollision::NewCollision(const NewCollision &to_copy) bool KX_TouchEventManager::NewCollision::operator<(const NewCollision &other) const { - return first < other.first || second < other.second || colldata < other.colldata; + //see strict weak ordering: https://support.microsoft.com/en-us/kb/949171 + if (first == other.first) { + if (second == other.second) { + return colldata < other.colldata; + } + return second < other.second; + } + return first < other.first; } -- cgit v1.2.3