SL-10297 fix MSVC warning controls (merge error)

2020-08-26 09:53:38 -04:00 · 2020-08-26 09:53:38 -04:00 · 4e4564dcf3
parent 50509a56b6
commit 4e4564dcf3
1 changed files with 2 additions and 1 deletions
--- 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>