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

[drmccoy at users.sourceforge.net]

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

Log Message:
-----------
SWORD25: Cast the pointer to unsigned long long

...Instead of to uint, which fails on my 64 bit system where pointers
are 64 bit, but normal ints 32 bit wide.

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:20:49 UTC (rev 53408)
+++ scummvm/trunk/engines/sword25/kernel/callbackregistry.h	2010-10-13 11:22:19 UTC (rev 53409)
@@ -74,8 +74,8 @@
 		}
 	};
 	struct CallbackPtr_Hash {
-		uint operator()(CallbackPtr x) const {
-			return (uint)x;
+		unsigned long long operator()(CallbackPtr x) const {
+			return (unsigned long long)x;
 		}
 	};
 

Modified: scummvm/trunk/engines/sword25/kernel/objectregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/objectregistry.h	2010-10-13 11:20:49 UTC (rev 53408)
+++ scummvm/trunk/engines/sword25/kernel/objectregistry.h	2010-10-13 11:22:19 UTC (rev 53409)
@@ -136,8 +136,8 @@
 		}
 	};
 	struct ClassPointer_Hash {
-		uint operator()(const T *x) const {
-			return (uint)x;
+		unsigned long long operator()(const T *x) const {
+			return (unsigned long long)x;
 		}
 	};
 


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