diff options
| author | Richard Linden <none@none> | 2013-01-08 23:50:27 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-08 23:50:27 -0800 |
| commit | 0ba9a00c3116b69745f2d5070ce772d5d4965dbf (patch) | |
| tree | d79795487a3bddf08ade8cef0a2a96d3e1ffb92f /indra/test_apps | |
| parent | 2f91ffb45c44c3406b1b97dc987cfb7593852a46 (diff) | |
SH-3468 WIP add memory tracking base class
cleaned up hacks used to get unit tests working
LLTrace::init now supports recursive initialization/cleanup
put NOMINMAX back in win32 header wrappers
Diffstat (limited to 'indra/test_apps')
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 99a82ed555..fa4f5abd28 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -41,7 +41,6 @@ #if LL_WINDOWS #pragma warning(disable: 4263) #pragma warning(disable: 4264) -#undef NOMINMAX #endif #if __APPLE__ |