aboutsummaryrefslogtreecommitdiff
path: root/gold/system.h
diff options
context:
space:
mode:
authorCary Coutant <ccoutant@google.com>2013-12-18 15:53:05 -0800
committerCary Coutant <ccoutant@google.com>2013-12-18 15:53:31 -0800
commit8356f2d009e20e5ca567f5f9456a40f75e9560dc (patch)
tree0a3ef9f8198083e62512b134e53159d6f2d008ac /gold/system.h
parenta6d17b01944cc51fec7f4bb74012a92e6f6a4293 (diff)
downloadgdb-8356f2d009e20e5ca567f5f9456a40f75e9560dc.zip
gdb-8356f2d009e20e5ca567f5f9456a40f75e9560dc.tar.gz
gdb-8356f2d009e20e5ca567f5f9456a40f75e9560dc.tar.bz2
Add configure checks for <unordered_set> and <unordered_map>.
gold/ * configure.ac: Check for <unordered_set> and <unordered_map>. * config.in: Regenerate. * configure: Regenerate. * system.h: Use <unordered_set> and <unordered_map> if available.
Diffstat (limited to 'gold/system.h')
-rw-r--r--gold/system.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/gold/system.h b/gold/system.h
index 3e6fe1d..aea3723 100644
--- a/gold/system.h
+++ b/gold/system.h
@@ -57,8 +57,21 @@
// Figure out how to get a hash set and a hash map.
-#if defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
- && defined(HAVE_TR1_UNORDERED_MAP_REHASH)
+#if defined(HAVE_UNORDERED_SET) && defined(HAVE_UNORDERED_MAP)
+
+#include <unordered_set>
+#include <unordered_map>
+
+// We need a template typedef here.
+
+#define Unordered_set std::unordered_set
+#define Unordered_map std::unordered_map
+#define Unordered_multimap std::unordered_multimap
+
+#define reserve_unordered_map(map, n) ((map)->rehash(n))
+
+#elif defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
+ && defined(HAVE_TR1_UNORDERED_MAP_REHASH)
#include <tr1/unordered_set>
#include <tr1/unordered_map>