diff options
author | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
commit | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (patch) | |
tree | adeadd5ef0b8c4514b325f74c3426b2af76e422b /indra/llcommon/llstringtable.h | |
parent | f53b2bd880875b5194b6d298e1aad7d8951db9f3 (diff) | |
parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) |
Pull merge of lindenlab/viewer-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 |