diff options
| author | skolb <none@none> | 2009-10-14 10:10:46 -0700 |
|---|---|---|
| committer | skolb <none@none> | 2009-10-14 10:10:46 -0700 |
| commit | 1b1550f284316b244a10a4a6604fedb5d6b18965 (patch) | |
| tree | 2416742bb0fa10c646c8490c39c3442fa73f1924 /indra/llcommon/llallocator_heap_profile.cpp | |
| parent | 1d63b145481021c5d0ed16bd0c10c320170d0cf5 (diff) | |
| parent | b5768a69b18936282cf55f0a1ecb72ba19849836 (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> |