Changeset 9314 for code/branches/presentation2012merge/src/modules

Timestamp:

Jul 8, 2012, 6:31:46 PM (13 years ago)

Author:

landauf

Message:

probably a bugfix: PickupIdentifier compared only the first parameter in the map.
also some performance enhancements

File:

• code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc (modified) (1 diff)

code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc

@@ -92 +92 @@
             const PickupIdentifier* id2 = (*it2)->getPickupIdentifier();
 
-            if(id1->compare(id2) < 0)
-                return -1;
-            if(id2->compare(id1) < 0)
-                return 1;
+            int result = id1->compare(id2);
+            if(result != 0)
+                return result;
         }