aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llstringtable.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llcommon/llstringtable.h')
-rw-r--r--linden/indra/llcommon/llstringtable.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llcommon/llstringtable.h b/linden/indra/llcommon/llstringtable.h
index d53c0e1..ddfef88 100644
--- a/linden/indra/llcommon/llstringtable.h
+++ b/linden/indra/llcommon/llstringtable.h
@@ -29,14 +29,15 @@
29#ifndef LL_STRING_TABLE_H 29#ifndef LL_STRING_TABLE_H
30#define LL_STRING_TABLE_H 30#define LL_STRING_TABLE_H
31 31
32#include "lldefs.h"
33#include "llformat.h"
32#include "llstl.h" 34#include "llstl.h"
33#include <list> 35#include <list>
34#include <set> 36#include <set>
35 37
36#if LL_WINDOWS 38#if LL_WINDOWS
37# if (_MSC_VER >= 1300) 39# if (_MSC_VER >= 1300 && _MSC_VER < 1400)
38# define STRING_TABLE_HASH_MAP 1 40# define STRING_TABLE_HASH_MAP 1
39# pragma warning(disable : 4996)
40# endif 41# endif
41#else 42#else
42//# define STRING_TABLE_HASH_MAP 1 43//# define STRING_TABLE_HASH_MAP 1