Revert "Adds TUnorderedMap and uses it for tLevel in TSymbolTableLevel."

src/compiler/translator/Common.h

@@ -7,17 +7,15 @@
 #ifndef COMPILER_TRANSLATOR_COMMON_H_
 #define COMPILER_TRANSLATOR_COMMON_H_
 
-#include <stdio.h>
-#include <limits>
 #include <map>
 #include <sstream>
 #include <string>
-#include <unordered_map>
 #include <vector>
+#include <limits>
+#include <stdio.h>
 
 #include "common/angleutils.h"
 #include "common/debug.h"
-#include "common/third_party/murmurhash/MurmurHash3.h"
 #include "compiler/translator/PoolAlloc.h"
 
 namespace sh
@@ -78,23 +76,6 @@ class TVector : public std::vector<T, pool_allocator<T>>
     TVector(size_type i) : std::vector<T, pool_allocator<T>>(i) {}
 };
 
-template <class K, class D, class H = std::hash<K>, class CMP = std::equal_to<K>>
-class TUnorderedMap : public std::unordered_map<K, D, H, CMP, pool_allocator<std::pair<const K, D>>>
-{
-  public:
-    POOL_ALLOCATOR_NEW_DELETE();
-    typedef pool_allocator<std::pair<const K, D>> tAllocator;
-
-    TUnorderedMap() : std::unordered_map<K, D, H, CMP, tAllocator>() {}
-    // use correct two-stage name lookup supported in gcc 3.4 and above
-    TUnorderedMap(const tAllocator &a)
-        : std::unordered_map<K, D, H, CMP, tAllocator>(
-              std::unordered_map<K, D, H, CMP, tAllocator>::key_compare(),
-              a)
-    {
-    }
-};
-
 template <class K, class D, class CMP = std::less<K>>
 class TMap : public std::map<K, D, CMP, pool_allocator<std::pair<const K, D>>>
 {
@@ -123,18 +104,4 @@ inline TString str(T i)
 
 }  // namespace sh
 
-namespace std
-{
-template <>
-struct hash<sh::TString>
-{
-    size_t operator()(const sh::TString &s) const
-    {
-        uint32_t result = 0;
-        MurmurHash3_x86_32(s.data(), static_cast<int>(s.length()), 0, &result);
-        return result;
-    }
-};
-}  // namespace std
-
 #endif  // COMPILER_TRANSLATOR_COMMON_H_

src/compiler/translator/SymbolTable.h

@@ -232,7 +232,7 @@ class TInterfaceBlockName : public TSymbol
 class TSymbolTableLevel
 {
   public:
-    typedef TUnorderedMap<TString, TSymbol *> tLevel;
+    typedef TMap<TString, TSymbol *> tLevel;
     typedef tLevel::const_iterator const_iterator;
     typedef const tLevel::value_type tLevelPair;
     typedef std::pair<tLevel::iterator, bool> tInsertResult;