Extract hash map hack from rw-task-fair.cpp

Hashmaps will be needed by the LP code.

Additionally, add definitions for hash maps with uint64_t keys.
This is only relevant for legacy C++ libs as used on Mac OS X.
On Linux, we use the newer C++ '11 STL implementation.

2 files changed, 36 insertions, 11 deletions

diff --git a/native/include/stl-hashmap.h b/native/include/stl-hashmap.h
new file mode 100644
index 0000000..2276a4d
--- /dev/null
+++ b/native/include/stl-hashmap.h
@@ -0,0 +1,35 @@
+#ifndef STL_HASHMAP_H_
+#define STL_HASHMAP_H_
+
+#ifdef CONFIG_USE_0X
+#include <unordered_map>
+#define hashmap std::unordered_map
+#else
+#include <ext/hash_map>
+
+namespace __gnu_cxx
+{
+template<>
+struct hash<long long int>
+{
+        size_t operator()(long long int __x) const
+        {
+                return __x;
+        }
+};
+
+template<>
+struct hash<unsigned long long int>
+{
+        size_t operator()(unsigned long long int __x) const
+        {
+                return __x;
+        }
+};
+
+};
+
+#define hashmap __gnu_cxx::hash_map
+#endif
+
+#endif
diff --git a/native/src/blocking/rw-task-fair.cpp b/native/src/blocking/rw-task-fair.cpp
index bb27c14..f3355c6 100644
--- a/native/src/blocking/rw-task-fair.cpp
+++ b/native/src/blocking/rw-task-fair.cpp
@@ -3,17 +3,7 @@
 #include "rw-blocking.h"
 
 #include "stl-helper.h"
-
-
-#ifdef CONFIG_USE_0X
-#include <unordered_map>
-#define hashmap std::unordered_map
-#else
-#include <ext/hash_map>
-#define hashmap __gnu_cxx::hash_map
-#endif
-
-
+#include "stl-hashmap.h"
 
 static Interference bound_blocking_all(
         const TaskInfo* tsk,