diff options
| -rw-r--r-- | common/advancedDetector.cpp | 8 | ||||
| -rw-r--r-- | common/file.cpp | 2 | ||||
| -rw-r--r-- | engines/agi/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/cine/cine.h | 2 | ||||
| -rw-r--r-- | graphics/fontman.h | 2 | ||||
| -rw-r--r-- | gui/eval.h | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp index 8999a60942..4387bd199e 100644 --- a/common/advancedDetector.cpp +++ b/common/advancedDetector.cpp @@ -268,7 +268,10 @@ PluginError AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) c return kNoError; } -static void reportUnknown(StringMap &filesMD5, HashMap<String, int32, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> &filesSize) { +typedef HashMap<String, bool> StringSet; +typedef HashMap<String, int32> IntMap; + +static void reportUnknown(StringMap &filesMD5, IntMap &filesSize) { // TODO: This message should be cleaned up / made more specific. // For example, we should specify at least which engine triggered this. // @@ -285,11 +288,8 @@ static void reportUnknown(StringMap &filesMD5, HashMap<String, int32, Common::Ca } static ADGameDescList detectGame(const FSList *fslist, const Common::ADParams ¶ms, Language language, Platform platform, const Common::String extra) { - typedef HashMap<String, bool, CaseSensitiveString_Hash, CaseSensitiveString_EqualTo> StringSet; StringSet filesList; - typedef StringMap StringMap; - typedef HashMap<String, int32, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> IntMap; StringMap filesMD5; IntMap filesSize; IntMap allFiles; diff --git a/common/file.cpp b/common/file.cpp index 4a7aed0e3d..386777e2c5 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -136,7 +136,7 @@ namespace Common { -typedef HashMap<String, int, CaseSensitiveString_Hash, CaseSensitiveString_EqualTo> StringIntMap; +typedef HashMap<String, int> StringIntMap; // The following two objects could be turned into static members of class // File. However, then we would be forced to #include hashmap in file.h diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index f526c51a27..cd6942f9c0 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -2148,7 +2148,7 @@ bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common: } const Common::ADGameDescription *AgiMetaEngine::fallbackDetect(const FSList *fslist) const { - typedef Common::HashMap<Common::String, int32, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> IntMap; + typedef Common::HashMap<Common::String, int32> IntMap; IntMap allFiles; bool matchedUsingFilenames = false; bool matchedUsingWag = false; diff --git a/engines/cine/cine.h b/engines/cine/cine.h index 7ce5231446..710840c17e 100644 --- a/engines/cine/cine.h +++ b/engines/cine/cine.h @@ -64,7 +64,7 @@ enum CineGameFeatures { struct CINEGameDescription; -typedef Common::HashMap<Common::String, const char *, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> StringPtrHashMap; +typedef Common::HashMap<Common::String, const char *> StringPtrHashMap; class CineEngine : public Engine { diff --git a/graphics/fontman.h b/graphics/fontman.h index eeefab77ec..7121c314cd 100644 --- a/graphics/fontman.h +++ b/graphics/fontman.h @@ -84,7 +84,7 @@ private: friend class Common::Singleton<SingletonBaseType>; FontManager(); - Common::HashMap<Common::String, const Font *, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> _fontMap; + Common::HashMap<Common::String, const Font *> _fontMap; }; diff --git a/gui/eval.h b/gui/eval.h index 245ab1230b..47c8313903 100644 --- a/gui/eval.h +++ b/gui/eval.h @@ -68,9 +68,9 @@ public: char *lastToken() { return _token; } - typedef HashMap<String, int, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> VariablesMap; - typedef HashMap<String, String, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> AliasesMap; - typedef HashMap<String, String, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> StringsMap; + typedef HashMap<String, int> VariablesMap; + typedef HashMap<String, String> AliasesMap; + typedef HashMap<String, String> StringsMap; private: enum TokenTypes { |