aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2010-10-13 11:22:19 +0000
committerSven Hesse2010-10-13 11:22:19 +0000
commitc86c0b6b96c06b89a3dbcc40f4082a39d7b185aa (patch)
treeb5c2b7366ca19747881039cbb371fa47219c4730
parenta876494fe7fb2653620c4674cfe11cd1bbd5b2bb (diff)
downloadscummvm-rg350-c86c0b6b96c06b89a3dbcc40f4082a39d7b185aa.tar.gz
scummvm-rg350-c86c0b6b96c06b89a3dbcc40f4082a39d7b185aa.tar.bz2
scummvm-rg350-c86c0b6b96c06b89a3dbcc40f4082a39d7b185aa.zip
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. svn-id: r53409
-rw-r--r--engines/sword25/kernel/callbackregistry.h4
-rw-r--r--engines/sword25/kernel/objectregistry.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword25/kernel/callbackregistry.h b/engines/sword25/kernel/callbackregistry.h
index 8671a932de..5dde8ba712 100644
--- a/engines/sword25/kernel/callbackregistry.h
+++ b/engines/sword25/kernel/callbackregistry.h
@@ -74,8 +74,8 @@ private:
}
};
struct CallbackPtr_Hash {
- uint operator()(CallbackPtr x) const {
- return (uint)x;
+ unsigned long long operator()(CallbackPtr x) const {
+ return (unsigned long long)x;
}
};
diff --git a/engines/sword25/kernel/objectregistry.h b/engines/sword25/kernel/objectregistry.h
index 0f50b79b00..2f4cb9d3f7 100644
--- a/engines/sword25/kernel/objectregistry.h
+++ b/engines/sword25/kernel/objectregistry.h
@@ -136,8 +136,8 @@ protected:
}
};
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;
}
};