diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-21 18:49:19 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-21 18:49:19 -0700 |
| commit | 642d368eccd662494a4958a50ba2bd3301b5207e (patch) | |
| tree | 0aaa9d2981260051009e765a6171ad328f031183 /indra/llcommon/llallocator_heap_profile.cpp | |
| parent | c7786aa5b614d1c88359bacbe9bd447f5acdd84c (diff) | |
| parent | e25395e10f5abbed1ed7bc3e4a7fc892070ddc50 (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> |