diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-07 02:48:44 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-07 02:48:44 +0000 |
| commit | 068558f888446691ebbb3df2105948e0d50300a5 (patch) | |
| tree | 5224e0fa3e627bc9018af9660198ef15b19c5487 /indra/llcommon | |
| parent | c4059553afa289f51f9966b4283b2a62b7103303 (diff) | |
merge release@58791 vc8@58828 -> release
Adds Dev Studio 2005 (VC8)
Reviewed by Rob
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 1 | ||||
| -rw-r--r-- | indra/llcommon/llstringtable.h | 3 | ||||
| -rw-r--r-- | indra/llcommon/u64.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index f4e24025d5..8fa171c482 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -93,6 +93,7 @@ #pragma warning( disable : 4284 ) // silly MS warning deep inside their <map> include file #pragma warning( disable : 4503 ) // 'decorated name length exceeded, name was truncated'. Does not seem to affect compilation. #pragma warning( disable : 4800 ) // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning) +#pragma warning( disable : 4996 ) // warning: deprecated #endif // LL_WINDOWS #endif // not LL_LINDEN_PREPROCESSOR_H diff --git a/indra/llcommon/llstringtable.h b/indra/llcommon/llstringtable.h index 20db115c6e..f293045119 100644 --- a/indra/llcommon/llstringtable.h +++ b/indra/llcommon/llstringtable.h @@ -17,9 +17,8 @@ #include <set> #if LL_WINDOWS -# if (_MSC_VER >= 1300) +# if (_MSC_VER >= 1300 && _MSC_VER < 1400) # define STRING_TABLE_HASH_MAP 1 -# pragma warning(disable : 4996) # endif #else //# define STRING_TABLE_HASH_MAP 1 diff --git a/indra/llcommon/u64.cpp b/indra/llcommon/u64.cpp index 7f0323aaad..b942322773 100644 --- a/indra/llcommon/u64.cpp +++ b/indra/llcommon/u64.cpp @@ -14,7 +14,7 @@ U64 str_to_U64(const char *str) { U64 result = 0; - char *aptr = strpbrk(str,"0123456789"); + const char *aptr = strpbrk(str,"0123456789"); if (!aptr) { |