summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichard <none@none>2009-11-12 13:54:30 -0800
committerrichard <none@none>2009-11-12 13:54:30 -0800
commit8c90e4d468f2b4d7f1ce3b3faec163886cbf9fd5 (patch)
tree9853ca951c5445a748f616dce7181e63587b82ae
parentc15a3a18d44fd5b5e72117200938c1eb33fb3c99 (diff)
DEV-42747 - lltreeiterators_test.cpp broken on Windows
reviewed by Nat
-rw-r--r--indra/llcommon/llpreprocessor.h1
-rw-r--r--indra/llcommon/tests/lltreeiterators_test.cpp3
2 files changed, 1 insertions, 3 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index 48244480b1..bb3301df9f 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)
diff --git a/indra/llcommon/tests/lltreeiterators_test.cpp b/indra/llcommon/tests/lltreeiterators_test.cpp
index d6d9f68110..31c70b4daa 100644
--- a/indra/llcommon/tests/lltreeiterators_test.cpp
+++ b/indra/llcommon/tests/lltreeiterators_test.cpp
@@ -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