aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-05-18 19:18:31 +0000
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-05-18 19:18:31 +0000
commite1e82ea4dca2c0ab5173de6799ffdfcb9659e7c2 (patch)
treea91d9ac33eb72e6d35bd09a0f9c6100af1892b8a
parent91e75c8a9c3b92c1699a156890fc97587bc17098 (diff)
downloadfsf-binutils-gdb-e1e82ea4dca2c0ab5173de6799ffdfcb9659e7c2.zip
fsf-binutils-gdb-e1e82ea4dca2c0ab5173de6799ffdfcb9659e7c2.tar.gz
fsf-binutils-gdb-e1e82ea4dca2c0ab5173de6799ffdfcb9659e7c2.tar.bz2
Fix define in gold.h
gold/: * gold.h (Unordered_multimap, Unordered_map): Fix defines for when neither HAVE_TR1_UNORDERED_MAP nor HAVE_EXT_HASH_MAP are set.
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/gold.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 1085875..b78195e 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-18 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * gold.h (Unordered_multimap, Unordered_map): Fix defines for
+ when neither HAVE_TR1_UNORDERED_MAP nor HAVE_EXT_HASH_MAP are set.
+
2010-05-18 Rafael Espindola <espindola@google.com>
* options.cc (General_options::finalize): Handle -nostdlib.
diff --git a/gold/gold.h b/gold/gold.h
index 5c98de0..04b6911 100644
--- a/gold/gold.h
+++ b/gold/gold.h
@@ -121,7 +121,7 @@ struct hash<T*>
#define Unordered_set std::set
#define Unordered_map std::map
-#define Unordered_map std::multimap
+#define Unordered_multimap std::multimap
#define reserve_unordered_map(map, n)