[Scummvm-cvs-logs] CVS: residual lab.h,1.2,1.3 localize.h,1.1,1.2 residual.vcproj,1.13,1.14 resource.h,1.4,1.5 hash_map.h,1.2,NONE

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Feb 21 07:32:04 CET 2004


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8363

Modified Files:
	lab.h localize.h residual.vcproj resource.h 
Removed Files:
	hash_map.h 
Log Message:
removed hash_map usage

Index: lab.h
===================================================================
RCS file: /cvsroot/scummvm/residual/lab.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lab.h	24 Aug 2003 17:56:03 -0000	1.2
+++ lab.h	21 Feb 2004 15:20:00 -0000	1.3
@@ -20,7 +20,7 @@
 
 #include <string>
 #include <cstdio>
-#include "hash_map.h"
+#include <map>
 
 class Block {
 public:
@@ -60,7 +60,7 @@
   };
 
   std::FILE *f_;
-  typedef std::hash_map<std::string, LabEntry> file_map_type;
+  typedef std::map<std::string, LabEntry> file_map_type;
   file_map_type file_map_;
 
   file_map_type::const_iterator find_filename(const char *filename) const;

Index: localize.h
===================================================================
RCS file: /cvsroot/scummvm/residual/localize.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- localize.h	15 Aug 2003 19:41:26 -0000	1.1
+++ localize.h	21 Feb 2004 15:20:00 -0000	1.2
@@ -18,7 +18,8 @@
 #ifndef LOCALIZE_H
 #define LOCALIZE_H
 
-#include "hash_map.h"
+#include <map>
+#include <string>
 
 class Localizer {
 public:
@@ -32,7 +33,7 @@
 
   static Localizer *instance_;
 
-  typedef std::hash_map<std::string, std::string> string_map;
+  typedef std::map<std::string, std::string> string_map;
   string_map entries_;
 };
 

Index: residual.vcproj
===================================================================
RCS file: /cvsroot/scummvm/residual/residual.vcproj,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- residual.vcproj	1 Feb 2004 09:11:54 -0000	1.13
+++ residual.vcproj	21 Feb 2004 15:20:00 -0000	1.14
@@ -164,9 +164,6 @@
 				RelativePath="engine.h">

 			</File>

 			<File

-				RelativePath="hash_map.h">

-			</File>

-			<File

 				RelativePath="keyframe.cpp">

 			</File>

 			<File


Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/residual/resource.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- resource.h	5 Oct 2003 17:45:46 -0000	1.4
+++ resource.h	21 Feb 2004 15:20:01 -0000	1.5
@@ -19,7 +19,7 @@
 #define RESOURCE_H
 
 #include "lab.h"
-#include "hash_map.h"
+#include "map"
 #include <list>
 #include <string>
 
@@ -114,7 +114,7 @@
 
   const Lab *findFile(const char *filename) const;
 
-  typedef std::hash_map<std::string, Resource *> cache_type;
+  typedef std::map<std::string, Resource *> cache_type;
   cache_type cache_;
 
   // Shut up pointless g++ warning

--- hash_map.h DELETED ---





More information about the Scummvm-git-logs mailing list