Move hash_* extension headers from ext/ to Support/ so that we can support

GCC 2.95, GCC 3.0.4 and GCC 3.1 all concurrently, without having to delete
headers after a chackou.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3055 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/Support/HashExtras.h b/include/Support/HashExtras.h
index d7e48a3b625d900458564bbd7bb064b6449f1ee1..da9e3f5cbadd9267d48e4c554fff290413a31454 100644 (file)
--- a/include/Support/HashExtras.h
+++ b/include/Support/HashExtras.h
@@ -11,7 +11,7 @@
 #define LLVM_SUPPORT_HASHEXTRAS_H
 
 #include <string>
-#include <ext/hash_map>
+#include <Support/hash_map>
 
 // Cannot specialize hash template from outside of the std namespace.
 namespace std {

diff --git a/include/Support/hash_map b/include/Support/hash_map
new file mode 100644 (file)
index 0000000..aefcc28
--- /dev/null
+++ b/include/Support/hash_map
@@ -0,0 +1,6 @@
+#if __GNUC__ == 3
+#include <ext/hash_map>
+using __gnu_cxx::hash_map;
+#else
+#include <hash_map>
+#endif

diff --git a/include/Support/hash_set b/include/Support/hash_set
new file mode 100644 (file)
index 0000000..f95cc36
--- /dev/null
+++ b/include/Support/hash_set
@@ -0,0 +1,6 @@
+#if __GNUC__==3
+#include <ext/hash_set>
+using __gnu_cxx::hash_set;
+#else
+#include <hash_set>
+#endif

diff --git a/include/llvm/ADT/HashExtras.h b/include/llvm/ADT/HashExtras.h
index d7e48a3b625d900458564bbd7bb064b6449f1ee1..da9e3f5cbadd9267d48e4c554fff290413a31454 100644 (file)
--- a/include/llvm/ADT/HashExtras.h
+++ b/include/llvm/ADT/HashExtras.h
@@ -11,7 +11,7 @@
 #define LLVM_SUPPORT_HASHEXTRAS_H
 
 #include <string>
-#include <ext/hash_map>
+#include <Support/hash_map>
 
 // Cannot specialize hash template from outside of the std namespace.
 namespace std {