summaryrefslogtreecommitdiff
path: root/indra/llcommon/mutex.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2019-12-03 11:45:14 -0500
committerNat Goodspeed <nat@lindenlab.com>2020-03-25 15:28:17 -0400
commitb080b06b422db6405982bee603118ee68e6c2500 (patch)
tree5a67a417b8ac8b27de697b66b5c8bd9fe5798c6a /indra/llcommon/mutex.h
parent0c42f50d6ba2d9cb5ee164e186572ffc7a8dbedf (diff)
DRTVWR-494: Encapsulate redundant VS boilerplate around <mutex>.
Diffstat (limited to 'indra/llcommon/mutex.h')
-rw-r--r--indra/llcommon/mutex.h22
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/llcommon/mutex.h b/indra/llcommon/mutex.h
new file mode 100644
index 0000000000..90d0942270
--- /dev/null
+++ b/indra/llcommon/mutex.h
@@ -0,0 +1,22 @@
+/**
+ * @file mutex.h
+ * @author Nat Goodspeed
+ * @date 2019-12-03
+ * @brief Wrap <mutex> in odious boilerplate
+ *
+ * $LicenseInfo:firstyear=2019&license=viewerlgpl$
+ * Copyright (c) 2019, Linden Research, Inc.
+ * $/LicenseInfo$
+ */
+
+#if LL_WINDOWS
+#pragma warning (push)
+#pragma warning (disable:4265)
+#endif
+// warning C4265: 'std::_Pad' : class has virtual functions, but destructor is not virtual
+
+#include <mutex>
+
+#if LL_WINDOWS
+#pragma warning (pop)
+#endif