From 9b7f025aedf9dc22f1fe382a64406489dfb0732a Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Fri, 29 Jan 2016 00:58:33 -0500
Subject: [PATCH] Supress warning around skipped tests
---
indra/llmath/tests/mathmisc_test.cpp | 7 +++++++
indra/llmessage/tests/llhost_test.cpp | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/indra/llmath/tests/mathmisc_test.cpp b/indra/llmath/tests/mathmisc_test.cpp
index f12140cf8f..50e4c70748 100755
--- a/indra/llmath/tests/mathmisc_test.cpp
+++ b/indra/llmath/tests/mathmisc_test.cpp
@@ -325,6 +325,10 @@ namespace tut
}
}
+#if LL_WINDOWS
+#pragma warning(push)
+#pragma warning(disable : 4702)
+#endif // LL_WINDOWS
template<> template<>
void sphere_object::test<2>()
{
@@ -436,6 +440,9 @@ namespace tut
}
}
}
+#if LL_WINDOWS
+#pragma warning(pop)
+#endif // LL_WINDOWS
}
namespace tut
diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp
index efca1bbfca..ce244d0030 100755
--- a/indra/llmessage/tests/llhost_test.cpp
+++ b/indra/llmessage/tests/llhost_test.cpp
@@ -147,6 +147,10 @@ namespace tut
}
+#if LL_WINDOWS
+#pragma warning(push)
+#pragma warning(disable : 4702)
+#endif // LL_WINDOWS
// getHostName() and setHostByName
template<> template<>
void host_object::test<9>()
@@ -192,6 +196,9 @@ namespace tut
throw;
}
}
+#if LL_WINDOWS
+#pragma warning(pop)
+#endif // LL_WINDOWS
// setHostByName for dotted IP
template<> template<>
--
GitLab