summaryrefslogtreecommitdiff
path: root/indra/test/test.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2019-05-21 12:09:26 -0400
committerOz Linden <oz@lindenlab.com>2019-05-21 12:09:26 -0400
commit46fb225134ef871a686d0571cc55256923eee110 (patch)
treeeb44cbfaac192a89149225b48b4ef9f9ee8354b5 /indra/test/test.cpp
parent07870a9ebb17e7a31df276f4ac2d8f52fec2a3b0 (diff)
suppress unreachable code warning because tut::fail triggers it
Diffstat (limited to 'indra/test/test.cpp')
-rw-r--r--indra/test/test.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 52ac855d9f..9d327ff3be 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -57,16 +57,11 @@
#include <gtest/gtest.h>
#endif
-#if LL_MSVC
-#pragma warning (push)
+#if LL_WINDOWS
#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/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/make_shared.hpp>