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.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 1085875c225b8faf7dc707ee97e6fbb3d1058846..b78195e943255e7b0bc348f950091afeb0baf05b 100644 (file)
--- 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 5c98de04684daf8d7f945be211c3f103e198859f..04b691150990d73fb352c7f5a2d18be3d8e8505f 100644 (file)
--- 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)