Changeset 10511

Timestamp:

May 30, 2015, 9:59:31 PM (9 years ago)

Author:

landauf

Message:

bugfix: comparison function was not symmetric.
e.g. two NetworkFunctionPointers:

NFP1 has pointer[0] = 1 and pointer[1] = 5;
NFP2 has pointer[0] = 5 and pointer[1] = 1

then so far NFP1 < NFP2 returned true and NFP2 < NFP1 also returned true
now the behavior is fixed

File:

• code/branches/core7/src/libraries/network/NetworkFunction.h (modified) (1 diff)

code/branches/core7/src/libraries/network/NetworkFunction.h

@@ -56 +56 @@
   {
 #if defined(ORXONOX_COMPILER_GCC) && defined(ORXONOX_ARCH_32)
-    return pointer[0]<b.pointer[0] ? true : pointer[1]<b.pointer[1];
-#else //ORXONOX_COMPILER_GCC
-    return pointer[0]<b.pointer[0] ? true : ( pointer[1]<b.pointer[1] ? true : ( pointer[2]<b.pointer[2] ? true : pointer[3]<b.pointer[3] ) );
-#endif //ORXONOX_COMPILER_GCC
+    if (pointer[0] != b.pointer[0])
+        return pointer[0] < b.pointer[0];
+    else if (pointer[1] != b.pointer[1])
+        return pointer[1] < b.pointer[1];
+    else
+        return false;
+#else
+    if (pointer[0] != b.pointer[0])
+        return pointer[0] < b.pointer[0];
+    else if (pointer[1] != b.pointer[1])
+        return pointer[1] < b.pointer[1];
+    else if (pointer[2] != b.pointer[2])
+        return pointer[2] < b.pointer[2];
+    else if (pointer[3] != b.pointer[3])
+        return pointer[3] < b.pointer[3];
+    else
+        return false;
+#endif
   }
 };