Merge pull request #245 from donpellegrino/244-remove-hash-map

244 remove hash map

Author: mielvds

libhdt/src/dictionary/PlainDictionary.hpp

@@ -41,29 +41,7 @@
 #include <algorithm>
 #include <fstream>
 #include <iostream>
-
-#ifndef WIN32
-#include <ext/hash_map>
-#else
 #include <unordered_map>
-#endif
-
-//#define GOOGLE_HASH
-
-#ifdef GOOGLE_HASH
-#include <sparsehash/sparse_hash_map>
-
-using google::sparse_hash_map;      // namespace where class lives by default
-using __gnu_cxx::hash;  // or __gnu_cxx::hash, or maybe tr1::hash, depending on your OS
-
-#else
-
-#ifndef WIN32
-namespace std { using namespace __gnu_cxx; }
-#endif
-
-#endif
-
 
 namespace hdt {
 
@@ -84,22 +62,10 @@ struct str_cmp {
 
 typedef std::pair<const char*, DictionaryEntry *> DictEntryPair;
 
-#ifdef GOOGLE_HASH
-typedef sparse_hash_map<const char *, DictionaryEntry *, hash<const char *>, str_cmp> DictEntryHash;
-#else
-
-#ifdef WIN32
-/*typedef std::hash_map<const char *, DictionaryEntry *, hash<const char *>, str_cmp> DictEntryHash;*/
-typedef unordered_map<const char *, DictionaryEntry *, hash<const char *>, str_cmp> DictEntryHash;
-#else
-typedef std::hash_map<const char *, DictionaryEntry *, __gnu_cxx::hash<const char *>, str_cmp> DictEntryHash;
-
-#endif
-#endif
+typedef std::unordered_map<const char *, DictionaryEntry *, hash<std::string>, str_cmp> DictEntryHash;
 
 typedef DictEntryHash::const_iterator DictEntryIt;
 
-
 class PlainDictionary : public ModifiableDictionary {
 private:
 	std::vector<DictionaryEntry*> predicates;