aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-06-29 09:01:17 +0000
committerFilippos Karapetis2010-06-29 09:01:17 +0000
commit316e96df2b48b1986488bfd57db37b9708f3e4ca (patch)
treedf76fe3de17bd8462c64c02434c228e798c95663
parent9f1320d5cc1d0892e0b3ea9812b6599125bd1c65 (diff)
downloadscummvm-rg350-316e96df2b48b1986488bfd57db37b9708f3e4ca.tar.gz
scummvm-rg350-316e96df2b48b1986488bfd57db37b9708f3e4ca.tar.bz2
scummvm-rg350-316e96df2b48b1986488bfd57db37b9708f3e4ca.zip
SCI: Removed reg_t_EqualTo, since reg_t already defines an equals operator
svn-id: r50485
-rw-r--r--engines/sci/engine/gc.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/engines/sci/engine/gc.h b/engines/sci/engine/gc.h
index 9f9347ca18..cfae517790 100644
--- a/engines/sci/engine/gc.h
+++ b/engines/sci/engine/gc.h
@@ -33,12 +33,6 @@
namespace Sci {
-struct reg_t_EqualTo {
- bool operator()(const reg_t& x, const reg_t& y) const {
- return (x.segment == y.segment) && (x.offset == y.offset);
- }
-};
-
struct reg_t_Hash {
uint operator()(const reg_t& x) const {
return (x.segment << 3) | x.offset;
@@ -48,7 +42,7 @@ struct reg_t_Hash {
/*
* The reg_t_hash_map is actually really a hashset
*/
-typedef Common::HashMap<reg_t, bool, reg_t_Hash, reg_t_EqualTo> reg_t_hash_map;
+typedef Common::HashMap<reg_t, bool, reg_t_Hash> reg_t_hash_map;
/**
* Finds all used references and normalises them to their memory addresses