From 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 1 Nov 2007 22:02:35 +0000
Subject: 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.
---
 indra/llcommon/llstringtable.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon/llstringtable.h')

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;
-- 
cgit v1.2.3