From e1e82ea4dca2c0ab5173de6799ffdfcb9659e7c2 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 18 May 2010 19:18:31 +0000 Subject: [PATCH] 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. --- gold/ChangeLog | 5 +++++ gold/gold.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 1085875c225..b78195e9432 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2010-05-18 Ralf Wildenhues + + * 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 * options.cc (General_options::finalize): Handle -nostdlib. diff --git a/gold/gold.h b/gold/gold.h index 5c98de04684..04b69115099 100644 --- a/gold/gold.h +++ b/gold/gold.h @@ -121,7 +121,7 @@ struct hash #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) -- 2.30.2