[Scummvm-cvs-logs] SF.net SVN: scummvm:[53413] scummvm/trunk/engines/sword25/kernel

[drmccoy at users.sourceforge.net]

Revision: 53413
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53413&view=rev
Author:   drmccoy
Date:     2010-10-13 11:42:17 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
SWORD25: Force cast to uint instead of unsigned long long

As per Fingolfin's request, because apparently there's no long long
in the C++ standard; and ScummVM's hashmap needs uint.

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/kernel/callbackregistry.h
    scummvm/trunk/engines/sword25/kernel/objectregistry.h

Modified: scummvm/trunk/engines/sword25/kernel/callbackregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/callbackregistry.h	2010-10-13 11:32:08 UTC (rev 53412)
+++ scummvm/trunk/engines/sword25/kernel/callbackregistry.h	2010-10-13 11:42:17 UTC (rev 53413)
@@ -74,8 +74,8 @@
 		}
 	};
 	struct CallbackPtr_Hash {
-		unsigned long long operator()(CallbackPtr x) const {
-			return (unsigned long long)x;
+		uint operator()(CallbackPtr x) const {
+			return *(uint *)&x;
 		}
 	};
 

Modified: scummvm/trunk/engines/sword25/kernel/objectregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/objectregistry.h	2010-10-13 11:32:08 UTC (rev 53412)
+++ scummvm/trunk/engines/sword25/kernel/objectregistry.h	2010-10-13 11:42:17 UTC (rev 53413)
@@ -136,8 +136,8 @@
 		}
 	};
 	struct ClassPointer_Hash {
-		unsigned long long operator()(const T *x) const {
-			return (unsigned long long)x;
+		uint operator()(const T *x) const {
+			return *(uint *)&x;
 		}
 	};
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.