diff options
author | Bastien Bouclet | 2017-10-25 19:17:11 +0200 |
---|---|---|
committer | GitHub | 2017-10-25 19:17:11 +0200 |
commit | bd82345f0b634e5ccf7b2412a0d7cad7232057c5 (patch) | |
tree | 724b183a5e39a6f3f52067d2f1214a7728b2709a /engines/fullpipe | |
parent | 2ded98b482f30d2a990f06365b7f612ab4d115b2 (diff) | |
parent | bbdbd85324a9c02019e242ab93b3ae569292356c (diff) | |
download | scummvm-rg350-bd82345f0b634e5ccf7b2412a0d7cad7232057c5.tar.gz scummvm-rg350-bd82345f0b634e5ccf7b2412a0d7cad7232057c5.tar.bz2 scummvm-rg350-bd82345f0b634e5ccf7b2412a0d7cad7232057c5.zip |
Merge pull request #1035 from bgK/require-64bits-integers
BUILD: Require 64bits integers
Diffstat (limited to 'engines/fullpipe')
-rw-r--r-- | engines/fullpipe/utils.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/engines/fullpipe/utils.h b/engines/fullpipe/utils.h index bb8c9651da..d19def663a 100644 --- a/engines/fullpipe/utils.h +++ b/engines/fullpipe/utils.h @@ -23,6 +23,7 @@ #ifndef FULLPIPE_UTILS_H #define FULLPIPE_UTILS_H +#include "common/hash-ptr.h" #include "common/hash-str.h" #include "common/array.h" #include "common/file.h" @@ -32,22 +33,7 @@ namespace Fullpipe { class CObject; class NGIArchive; -struct Pointer_EqualTo { - bool operator()(const void *x, const void *y) const { return x == y; } -}; - -struct Pointer_Hash { - uint operator()(const void *x) const { -#ifdef SCUMM_64BITS - uint64 v = (uint64)x; - return (v >> 32) ^ (v & 0xffffffff); -#else - return (uint)x; -#endif - } -}; - -typedef Common::HashMap<void *, int, Pointer_Hash, Pointer_EqualTo> ObjHash; +typedef Common::HashMap<void *, int> ObjHash; typedef Common::HashMap<Common::String, int, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> ClassMap; |