From b080b06b422db6405982bee603118ee68e6c2500 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 3 Dec 2019 11:45:14 -0500
Subject: DRTVWR-494: Encapsulate redundant VS boilerplate around <mutex>.

---
 indra/llcommon/llthreadsafequeue.h | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'indra/llcommon/llthreadsafequeue.h')

diff --git a/indra/llcommon/llthreadsafequeue.h b/indra/llcommon/llthreadsafequeue.h
index b0bddac8e5..2cee7a3141 100644
--- a/indra/llcommon/llthreadsafequeue.h
+++ b/indra/llcommon/llthreadsafequeue.h
@@ -30,19 +30,9 @@
 #include "llexception.h"
 #include <deque>
 #include <string>
-
-#if LL_WINDOWS
-#pragma warning (push)
-#pragma warning (disable:4265)
-#endif
-// 'std::_Pad' : class has virtual functions, but destructor is not virtual
-#include <mutex>
+#include "mutex.h"
 #include <condition_variable>
 
-#if LL_WINDOWS
-#pragma warning (pop)
-#endif
-
 //
 // A general queue exception.
 //
-- 
cgit v1.2.3