diff --git a/hash_map.h b/hash_map.h deleted file mode 100644 index 9fabb7c06dd..00000000000 --- a/hash_map.h +++ /dev/null @@ -1,42 +0,0 @@ -// Residual - Virtual machine to run LucasArts' 3D adventure games -// Copyright (C) 2003 The ScummVM-Residual Team (www.scummvm.org) -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -#ifndef HASH_MAP_HH -#define HASH_MAP_HH - -#ifdef _MSC_VER -#include -#else -#include -#endif -#include - -#ifndef _MSC_VER -namespace std { - using namespace __gnu_cxx; -}; - -namespace __gnu_cxx { - template<> struct hash { - size_t operator()(const std::string &s) const { - return std::hash()(s.c_str()); - } - }; -} -#endif - -#endif diff --git a/lab.h b/lab.h index 5439a8f1aff..30a745d4696 100644 --- a/lab.h +++ b/lab.h @@ -20,7 +20,7 @@ #include #include -#include "hash_map.h" +#include class Block { public: @@ -60,7 +60,7 @@ private: }; std::FILE *f_; - typedef std::hash_map file_map_type; + typedef std::map file_map_type; file_map_type file_map_; file_map_type::const_iterator find_filename(const char *filename) const; diff --git a/localize.h b/localize.h index 63bbf47de2a..392132ab1ee 100644 --- a/localize.h +++ b/localize.h @@ -18,7 +18,8 @@ #ifndef LOCALIZE_H #define LOCALIZE_H -#include "hash_map.h" +#include +#include class Localizer { public: @@ -32,7 +33,7 @@ private: static Localizer *instance_; - typedef std::hash_map string_map; + typedef std::map string_map; string_map entries_; }; diff --git a/residual.vcproj b/residual.vcproj index 129a0005352..d2c6c484a8a 100644 --- a/residual.vcproj +++ b/residual.vcproj @@ -163,9 +163,6 @@ - - diff --git a/resource.h b/resource.h index fa46069542a..14cb1e1734c 100644 --- a/resource.h +++ b/resource.h @@ -19,7 +19,7 @@ #define RESOURCE_H #include "lab.h" -#include "hash_map.h" +#include "map" #include #include @@ -114,7 +114,7 @@ private: const Lab *findFile(const char *filename) const; - typedef std::hash_map cache_type; + typedef std::map cache_type; cache_type cache_; // Shut up pointless g++ warning