diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
| commit | d373dcc7cbed5fdea72c6b71a5594e4e85549b43 (patch) | |
| tree | 140e20f48db5dc4d7842f05ef2c24ef9e6fc3238 /indra/llcommon/llhash.h | |
| parent | c78f99b0b3b4b9ac99a69b63315e821d89a89a3b (diff) | |
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
Diffstat (limited to 'indra/llcommon/llhash.h')
| -rw-r--r-- | indra/llcommon/llhash.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llhash.h b/indra/llcommon/llhash.h index fbf059bbcd..d03c70b04b 100644 --- a/indra/llcommon/llhash.h +++ b/indra/llcommon/llhash.h @@ -22,6 +22,8 @@ # else # include <hashtable.h> # endif +#elif LL_SOLARIS +#include <ext/hashtable.h> #else #error Please define your platform. #endif @@ -33,7 +35,7 @@ template<class T> inline size_t llhash(T value) #elif ( (defined _STLPORT_VERSION) || ((LL_LINUX) && (__GNUC__ <= 2)) ) std::hash<T> H; return H(value); -#elif LL_DARWIN || LL_LINUX +#elif LL_DARWIN || LL_LINUX || LL_SOLARIS __gnu_cxx::hash<T> H; return H(value); #else |