summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-10-13 16:35:49 -0700
committerRick Pasetto <rick@lindenlab.com>2009-10-13 16:35:49 -0700
commitd9c1237e6f64f61fd9a8c8dc529f4c5e595cfaef (patch)
tree4297b96201c512352249441316257969cfea9211 /indra
parentd5c43669d504549966083ded67ee59ceaf8c4c26 (diff)
Disable boost::lexical_cast warning
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/tests/llmediadataclient_test.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/tests/llmediadataclient_test.cpp b/indra/newview/tests/llmediadataclient_test.cpp
index 7d424c9326..b4700c9bbc 100644
--- a/indra/newview/tests/llmediadataclient_test.cpp
+++ b/indra/newview/tests/llmediadataclient_test.cpp
@@ -46,7 +46,14 @@
#include "../../llprimitive/lltextureentry.cpp"
#include "../../llmessage/tests/llcurl_stub.cpp"
+#if LL_WINDOWS
+#pragma warning (push)
+#pragma warning (disable : 4702) // boost::lexical_cast generates this warning
+#endif
#include <boost/lexical_cast.hpp>
+#if LL_WINDOWS
+#pragma warning (pop)
+#endif
#define VALID_OBJECT_ID "3607d5c4-644b-4a8a-871a-8b78471af2a2"
#define VALID_OBJECT_ID_1 "11111111-1111-1111-1111-111111111111"