diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-12-03 09:17:51 -0800 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-12-03 09:17:51 -0800 |
| commit | 5fd2938da8d6709a6596833088fd83c60d591507 (patch) | |
| tree | 9186f79b996eb60a9bb1f5cefada86c0596ac850 /indra/llcommon/llpreprocessor.h | |
| parent | 97f97f286ccca1f736c575f516a61c6a32787807 (diff) | |
| parent | 57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (diff) | |
Merge with recent viewer-2-0
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) ) |