From 7915dc45624e714706c497b45b5f2b663fa0cdc2 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 2 Dec 2019 15:40:02 -0500
Subject: DRTVWR-494: Quiet VS warnings about its own <mutex> header.

---
 indra/llcommon/llinstancetracker.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index 76b201ad8c..3c8a5e3fb6 100644
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -32,10 +32,20 @@
 #include <set>
 #include <vector>
 #include <typeinfo>
-#include <mutex>
 #include <memory>
 #include <type_traits>
 
+#if LL_WINDOWS
+#pragma warning (push)
+#pragma warning (disable:4265)
+#endif
+// 'std::_Pad' : class has virtual functions, but destructor is not virtual
+#include <mutex>
+
+#if LL_WINDOWS
+#pragma warning (pop)
+#endif
+
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
 #include <boost/iterator/filter_iterator.hpp>
-- 
cgit v1.2.3