diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-10-23 13:05:59 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-10-23 13:05:59 -0400 |
| commit | c9775dde6249582f0e8976be15e72bfebc4ac3fc (patch) | |
| tree | 83407157dae234db649dfff763e68f6e3c843335 /indra/llcommon/llstringtable.h | |
| parent | 1a72325ef1e8c798066d8ef7f82acd08d60fb68c (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
merge up to 3.6.9-release
Diffstat (limited to 'indra/llcommon/llstringtable.h')
| -rwxr-xr-x | indra/llcommon/llstringtable.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llcommon/llstringtable.h b/indra/llcommon/llstringtable.h index 59d7372ed4..ff09e71677 100755 --- a/indra/llcommon/llstringtable.h +++ b/indra/llcommon/llstringtable.h @@ -42,14 +42,6 @@ //# define STRING_TABLE_HASH_MAP 1 #endif -#if STRING_TABLE_HASH_MAP -# if LL_WINDOWS -# include <hash_map> -# else -# include <ext/hash_map> -# endif -#endif - const U32 MAX_STRINGS_LENGTH = 256; class LL_COMMON_API LLStringTableEntry |