[Scummvm-cvs-logs] SF.net SVN: scummvm:[50485] scummvm/trunk/engines/sci/engine/gc.h

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue Jun 29 11:01:17 CEST 2010


Revision: 50485
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50485&view=rev
Author:   thebluegr
Date:     2010-06-29 09:01:17 +0000 (Tue, 29 Jun 2010)

Log Message:
-----------
SCI: Removed reg_t_EqualTo, since reg_t already defines an equals operator

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/gc.h

Modified: scummvm/trunk/engines/sci/engine/gc.h
===================================================================
--- scummvm/trunk/engines/sci/engine/gc.h	2010-06-29 09:00:08 UTC (rev 50484)
+++ scummvm/trunk/engines/sci/engine/gc.h	2010-06-29 09:01:17 UTC (rev 50485)
@@ -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 @@
 /*
  * 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


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




More information about the Scummvm-git-logs mailing list