diff options
| author | Nicky <sl.nicky.ml@googlemail.com> | 2016-04-24 12:51:26 +0200 |
|---|---|---|
| committer | Nicky <sl.nicky.ml@googlemail.com> | 2016-04-24 12:51:26 +0200 |
| commit | a590d1c63ae4c1434da600d60b5c32c9b8a7a1de (patch) | |
| tree | 7cb819dacab75676ff3243437c9b207529390a6d /indra/llcommon | |
| parent | c87d24ac71c662ab37b6b937f92d960c6d8d092f (diff) | |
Windows z64: Disable warning 4267 via llpreprocessor rather than cmake files
(transplanted from 165fa5852652a1da005cf3b2201c192f028efd43)
Diffstat (limited to 'indra/llcommon')
| -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 |