diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-11-16 10:56:05 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-11-16 10:56:05 -0500 |
| commit | 934b94e74a94f13521b67bdd016a5b591e16fe13 (patch) | |
| tree | d181a0811e1f6773f0a4bd44c72dae48fae45a4e /indra/llcommon/llpreprocessor.h | |
| parent | af349febb3275bc1d75026f1f022595b50abda24 (diff) | |
| parent | 0c8556921d05a356afd4014b966ee8c0e1002e36 (diff) | |
DRTVWR-418: pull in new viewer-release via viewer64
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 2c4bcc91f6..7c277c2bed 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -138,6 +138,12 @@ #pragma warning( 3 : 4266 ) // 'function' : no override available for virtual member function from base 'type'; function is hidden #pragma warning (disable : 4180) // qualifier applied to function type has no meaning; ignored //#pragma warning( disable : 4284 ) // silly MS warning deep inside their <map> include file + +#ifdef _M_AMD64 +// That one is all over the place for x64 builds. +#pragma warning( disable : 4267 ) // 'var' : conversion from 'size_t' to 'type', possible loss of data) +#endif + #pragma warning( disable : 4503 ) // 'decorated name length exceeded, name was truncated'. Does not seem to affect compilation. #pragma warning( disable : 4800 ) // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning) #pragma warning( disable : 4996 ) // warning: deprecated |