diff --git a/src/framework/Utilities/UnorderedMapSet.h b/src/framework/Utilities/UnorderedMapSet.h
index 2a510a627..d890a7b53 100644
--- a/src/framework/Utilities/UnorderedMapSet.h
+++ b/src/framework/Utilities/UnorderedMapSet.h
@@ -21,8 +21,10 @@
 
 #include "Platform/CompilerDefs.h"
 #include "Platform/Define.h"
-
-#if COMPILER == COMPILER_INTEL
+#if COMPILER == COMPILER_CLANG
+#  include <tr1/unordered_map>
+#  include <tr1/unordered_set>
+#elif COMPILER == COMPILER_INTEL
 #  include <ext/hash_map>
 #  include <ext/hash_set>
 #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
@@ -87,12 +89,17 @@ HASH_NAMESPACE_END
 #  define HASH_NAMESPACE_END }
 using std::hash_map;
 using std::hash_set;
+#elif COMPILER == COMPILER_CLANG
+#  define UNORDERED_MAP std::tr1::unordered_map
+#  define UNORDERED_SET std::tr1::unordered_set
+#  define HASH_NAMESPACE_START namespace std { namespace tr1 {
+#  define HASH_NAMESPACE_END } }
 #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 #  define UNORDERED_MAP std::tr1::unordered_map
 #  define UNORDERED_SET std::tr1::unordered_set
 #  define HASH_NAMESPACE_START namespace std { namespace tr1 {
 #  define HASH_NAMESPACE_END } }
-#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3
+#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 3)
 #  define UNORDERED_MAP __gnu_cxx::hash_map
 #  define UNORDERED_SET __gnu_cxx::hash_set
 #  define HASH_NAMESPACE_START namespace __gnu_cxx {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index d27e1ca01..af2063fd6 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12772"
+ #define REVISION_NR "12773"
 #endif // __REVISION_NR_H__