diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-22 13:10:59 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-22 13:10:59 -0700 |
| commit | b8ce05ed08a7db0825c04c217888814ef523027a (patch) | |
| tree | cae04332048f649e1280d3bdc3d20f46df773e67 /indra/llcommon/llstringtable.h | |
| parent | e5484e56b3c13e65bd31d7bf21c1cd3a2d9333f2 (diff) | |
| parent | a464d469705aeae57fcdbfafa45e2bf592a182c5 (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llstringtable.h')
| -rw-r--r-- | indra/llcommon/llstringtable.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/indra/llcommon/llstringtable.h b/indra/llcommon/llstringtable.h index 888361b0b9..d40c9d8dfd 100644 --- a/indra/llcommon/llstringtable.h +++ b/indra/llcommon/llstringtable.h @@ -48,15 +48,17 @@ //# define STRING_TABLE_HASH_MAP 1 #endif -#if LL_WINDOWS -#include <hash_map> -#else -#include <ext/hash_map> +#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 LLStringTableEntry +class LL_COMMON_API LLStringTableEntry { public: LLStringTableEntry(const char *str); @@ -69,7 +71,7 @@ public: S32 mCount; }; -class LLStringTable +class LL_COMMON_API LLStringTable { public: LLStringTable(int tablesize); @@ -103,7 +105,7 @@ public: #endif }; -extern LLStringTable gStringTable; +extern LL_COMMON_API LLStringTable gStringTable; //============================================================================ @@ -113,7 +115,7 @@ extern LLStringTable gStringTable; typedef const std::string* LLStdStringHandle; -class LLStdStringTable +class LL_COMMON_API LLStdStringTable { public: LLStdStringTable(S32 tablesize = 0) |