livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

master
richard 2009-11-12 14:03:29 -08:00
parent fc6b3d4caa 8c90e4d468
commit 767e97d2b9
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llcommon/llpreprocessor.h
View File

@ -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)

3
indra/llcommon/tests/lltreeiterators_test.cpp
View File

@ -35,9 +35,6 @@
// Precompiled header
#include "linden_common.h"
#if LL_WINDOWS
#pragma warning (disable : 4180) // qualifier applied to function type has no meaning; ignored
#endif
// STL headers
// std headers