From 4e4564dcf31766469ccf41e0eef82bc234fda72c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 26 Aug 2020 09:53:38 -0400
Subject: SL-10297 fix MSVC warning controls (merge error)

---
 indra/test/test.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/test/test.cpp')

diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index b16fcb84d6..748d042631 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -58,7 +58,8 @@
 #include <gtest/gtest.h>
 #endif
 
-#if LL_WINDOWS
+#if LL_MSVC
+#pragma warning (push)
 #pragma warning (disable : 4702) // warning C4702: unreachable code
 #endif
 #include <boost/iostreams/tee.hpp>
-- 
cgit v1.2.3