diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
| commit | 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac (patch) | |
| tree | 52f41bda3e57a58e968421212a8a48eead6f653d /indra/llcommon/llstringtable.h | |
| parent | 833e8d5c2a1dd48fd89b8b438dbe56572697bb76 (diff) | |
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
Diffstat (limited to 'indra/llcommon/llstringtable.h')
| -rw-r--r-- | indra/llcommon/llstringtable.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llcommon/llstringtable.h b/indra/llcommon/llstringtable.h index b7412ef68f..f7206fe4f8 100644 --- a/indra/llcommon/llstringtable.h +++ b/indra/llcommon/llstringtable.h @@ -47,8 +47,10 @@ //# define STRING_TABLE_HASH_MAP 1 #endif -#if STRING_TABLE_HASH_MAP +#if LL_WINDOWS #include <hash_map> +#else +#include <ext/hash_map> #endif const U32 MAX_STRINGS_LENGTH = 256; @@ -99,7 +101,11 @@ public: S32 mUniqueEntries; #if STRING_TABLE_HASH_MAP +#if LL_WINDOWS typedef std::hash_multimap<U32, LLStringTableEntry *> string_hash_t; +#else + typedef __gnu_cxx::hash_multimap<U32, LLStringTableEntry *> string_hash_t; +#endif string_hash_t mStringHash; #else typedef std::list<LLStringTableEntry *> string_list_t; |