diff options
| author | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-01 18:50:53 -0800 |
|---|---|---|
| committer | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-01 18:50:53 -0800 |
| commit | 916720dd110d089a295e2c28f1702da7e6725e83 (patch) | |
| tree | 090eec84797cfa6014a9b42cb0659e6e8d2a8cd9 /indra/llcommon/llpreprocessor.h | |
| parent | 9026ac3264b00636a72a0c196b02cdac96b2c156 (diff) | |
| parent | 1db0d32133f97b03a632f03fa78e198b7f00866b (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index bb3301df9f..5eefa6a16b 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -128,6 +128,10 @@ #pragma warning( disable : 4800 ) // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning) #pragma warning( disable : 4996 ) // warning: deprecated +// Linker optimization with "extern template" generates these warnings +#pragma warning( disable : 4231 ) // nonstandard extension used : 'extern' before template explicit instantiation +#pragma warning( disable : 4506 ) // no definition for inline function + // level 4 warnings that we need to disable: #pragma warning (disable : 4100) // unreferenced formal parameter #pragma warning (disable : 4127) // conditional expression is constant (e.g. while(1) ) |