Browse Source

Cast the casts for some of the hash operations

James Urquhart 11 years ago
parent
commit
da09e017c8
2 changed files with 2 additions and 2 deletions
  1. 1 1
      engine/source/2d/core/SpriteBatchItem.h
  2. 1 1
      engine/source/collection/hashTable.h

+ 1 - 1
engine/source/2d/core/SpriteBatchItem.h

@@ -139,7 +139,7 @@ public:
         operator const U32() const
         {
 #ifdef TORQUE_64
-            return (U64)(mArgString) * (U32)2654435761;
+            return (U32)((U64)(mArgString) * (U32)2654435761);
 #else
             return (U32)(mArgString) * (U32)2654435761;
 #endif

+ 1 - 1
engine/source/collection/hashTable.h

@@ -42,7 +42,7 @@ namespace Hash
    inline U32 hash(const void *data)
    {
 #ifdef TORQUE_64
-      return (U64)data;
+      return (U32)((U64)data);
 #else
       return (U32)data;
 #endif