diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-09-16 00:14:29 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-09-16 00:20:30 +0200 |
| commit | dc20109d55a525ba9772e3fac49e41d28ba39f04 (patch) | |
| tree | 0e28969a195e6506352fe3f0ae43cb27ba047159 /crawl-ref/source/AppHdr.h | |
| parent | 6ed63208da136e0175866bb8c3a82b64b0b5fdcb (diff) | |
| download | crawl-ref-dc20109d55a525ba9772e3fac49e41d28ba39f04.tar.gz crawl-ref-dc20109d55a525ba9772e3fac49e41d28ba39f04.zip | |
Revert "Use std::unordered_map instead of std::map -- O(1) vs O(log n), in one place for now."
It appears Apple's gcc-4.0 has problems there, and they don't provide fixes;
never versions don't have their patches for ppc SDK.
Having O(1) maps would be nice, but I don't think we anywhere use an amount
of data where O(log n) makes a real difference. A new case where I wanted a
hash table for can be done by hand.
This reverts commit 6c9450d3706569e5eedf0cdd7e0327fe8d50612a.
Diffstat (limited to 'crawl-ref/source/AppHdr.h')
| -rw-r--r-- | crawl-ref/source/AppHdr.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index ad2a763f48..26ed4fda2c 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -373,18 +373,6 @@ inline void UNUSED(const volatile T &) { } -#if defined __GNUC__ - // gcc-4.0 and gcc-4.1 need the tr1 prefix. -# include <tr1/unordered_map> -# define unordered_map tr1::unordered_map -#else - // This doesn't work on MSVC <= 8; it is possible to use stdext::hash_map - // with the same STL API, but I have no means to test. - // #if _MSC_VER < 1600 -# include <unordered_map> -#endif - - #endif // __cplusplus // And now headers we want precompiled |