summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-02-07 13:06:38 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-02-07 13:06:38 -0500
commit33a42b32ca72031a79edca821966f6ebbdcddc93 (patch)
tree8cb6087b3d7b7d2cbb3a7c64c65d3591312bf3ba /indra/test
parent90ba675da4416a7f75f59340633e2c007b6cc029 (diff)
Disable MSVC warning C4702 (unreachable code) in Boost headers.
Diffstat (limited to 'indra/test')
-rw-r--r--indra/test/test.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 3e7be29b39..1adcfb6f45 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -54,8 +54,16 @@
#include <gtest/gtest.h>
#endif
+#if LL_MSVC
+#pragma warning (push)
+#pragma warning (disable : 4702) // warning C4702: unreachable code
+#endif
#include <boost/iostreams/tee.hpp>
#include <boost/iostreams/stream.hpp>
+#if LL_MSVC
+#pragma warning (pop)
+#endif
+
#include <boost/shared_ptr.hpp>
#include <boost/make_shared.hpp>
#include <boost/foreach.hpp>