diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-20 12:59:16 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-20 12:59:16 -0700 |
| commit | 85c4d40614b501d401159b9bb064a4f4c726265e (patch) | |
| tree | ef610b296660a2969d4df60ef331a3b4b411b676 /indra/llcommon/llallocator_heap_profile.cpp | |
| parent | a68b34eadf99c5875f2d7692185706e490e850bd (diff) | |
| parent | b0dccf883ad67e43b9fac5bc81f7b79bf9c07f8c (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llallocator_heap_profile.cpp')
| -rw-r--r-- | indra/llcommon/llallocator_heap_profile.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llallocator_heap_profile.cpp b/indra/llcommon/llallocator_heap_profile.cpp index d82ee9ed81..0a807702d0 100644 --- a/indra/llcommon/llallocator_heap_profile.cpp +++ b/indra/llcommon/llallocator_heap_profile.cpp @@ -38,6 +38,7 @@ // disable warning about boost::lexical_cast returning uninitialized data // when it fails to parse the string #pragma warning (disable:4701) +#pragma warning (disable:4702) #endif #include <boost/algorithm/string/split.hpp> |