hash_map and hash_set:

[oota-llvm.git] / include / Support / hash_map

diff --git a/include/Support/hash_map b/include/Support/hash_map
index 68ee596a855697dabaf3051722f485497936a5af..b6eda7a0127ef4594c20986ae893612c9f501ebd 100644 (file)
--- a/include/Support/hash_map
+++ b/include/Support/hash_map
@@ -1,5 +1,6 @@
 //===-- Support/hash_map - "Portable" wrapper around hash_map ---*- C++ -*-===//
-//
+// vim:ft=cpp
+// 
 // This file provides a wrapper around the mysterious <hash_map> header file
 // that seems to move around between GCC releases into and out of namespaces at
 // will.  #including this header will cause hash_map to be available in the
@@ -7,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_HASHMAP_H
-#define SUPPORT_HASHMAP_H
+#ifndef SUPPORT_HASH_MAP
+#define SUPPORT_HASH_MAP
 
 // Compiler Support Matrix
 //
@@ -17,28 +18,38 @@
 //  3.0.4       std      ext/hash_map
 //  3.1      __gnu_cxx   ext/hash_map
 //
-#if __GNUC__ == 3
-#include <ext/hash_map>
 
-#ifndef HASH_NAMESPACE
-#if __GNUC_MINOR__ == 0
-#define HASH_NAMESPACE std
-#else
+#include "Config/config.h"
+
+#ifdef HAVE_GNU_EXT_HASH_MAP
+// This is for GCC-3.1+ which puts hash in ext/hash_map
+#include <ext/hash_map>
 #define HASH_NAMESPACE __gnu_cxx
-#endif
-#endif
 
 #else
 
+// This is for GCC-3.0.x which puts hashmap in the `ext' directory.
+#ifdef HAVE_STD_EXT_HASH_MAP
+#include <ext/hash_map>
+#define HASH_NAMESPACE std
+
+#else
+// This handles older, pre-3.0 GCC which do not have the extentions in the `ext'
+// directory, and ignore the `std' namespace.
 #include <hash_map>
-#ifndef HASH_NAMESPACE
 #define HASH_NAMESPACE std
 #endif
+
 #endif
 
 using HASH_NAMESPACE::hash_map;
+using HASH_NAMESPACE::hash_multimap;
 using HASH_NAMESPACE::hash;
 
+// Include vector because ext/hash_map includes stl_vector.h and leaves
+// out specializations like stl_bvector.h, causing link conflicts.
+#include <vector>
+
 #include <Support/HashExtras.h>
 
 #endif