diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-16 11:05:33 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-16 11:05:33 -0500 |
| commit | 95cbf689f343ba4c0c352993273b5bb20812e36c (patch) | |
| tree | dabc2ffc10bc027da8c60168e0190a0da98b5722 /indra/llcommon/llpreprocessor.h | |
| parent | 59eb2815bfea9b0a826e006090d0fef80ae1f6b8 (diff) | |
| parent | 6f52f1e502cf030ceb4e14963fdda1021ea33023 (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 48baa50edb..dda9a95597 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -122,6 +122,7 @@ #pragma warning( 3 : 4264 ) // "'virtual_function' : no override available for virtual member function from base 'class'; function is hidden"
#pragma warning( 3 : 4265 ) // "class has virtual functions, but destructor is not virtual"
#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
#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)
|