summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2020-08-26 15:33:20 -0400
committerOz Linden <oz@lindenlab.com>2020-08-26 15:33:20 -0400
commit1aa140d3affa28d85a41d55f2566a19fb9d2cff5 (patch)
treedd49c5ef41eb41358a7ef1070e61e74788a0d7dc
parent4e4564dcf31766469ccf41e0eef82bc234fda72c (diff)
SL-10297 fix MSVC unreachable code warning
-rw-r--r--indra/test/test.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 748d042631..55dad94bc1 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -77,8 +77,14 @@
LLError::ErrFatalHookResult wouldHaveCrashed(const std::string& message)
{
+#if LL_MSVC
+#pragma warning (push)
+#pragma warning (disable : 4702) // warning C4702: unreachable code
tut::fail("fatal error message: " + message);
return LLError::ERR_DO_NOT_CRASH;
+#if LL_MSVC
+#pragma warning (pop)
+#endif
}
namespace tut