diff options
| author | Oz Linden <oz@lindenlab.com> | 2020-08-26 09:53:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2020-08-26 09:53:38 -0400 |
| commit | 4e4564dcf31766469ccf41e0eef82bc234fda72c (patch) | |
| tree | 4cca9fc4fab3f4145d60f35f17e9023397cc8670 /indra | |
| parent | 50509a56b6714a1a075463a02e5a853d97a3c461 (diff) | |
SL-10297 fix MSVC warning controls (merge error)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/test/test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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> |