diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/gold.h | 2 |
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) |