diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-12-03 11:45:14 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 15:28:17 -0400 |
| commit | b080b06b422db6405982bee603118ee68e6c2500 (patch) | |
| tree | 5a67a417b8ac8b27de697b66b5c8bd9fe5798c6a /indra/llcommon/llmutex.h | |
| parent | 0c42f50d6ba2d9cb5ee164e186572ffc7a8dbedf (diff) | |
DRTVWR-494: Encapsulate redundant VS boilerplate around <mutex>.
Diffstat (limited to 'indra/llcommon/llmutex.h')
| -rw-r--r-- | indra/llcommon/llmutex.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/llcommon/llmutex.h b/indra/llcommon/llmutex.h index f841d7f950..1a93c048b6 100644 --- a/indra/llcommon/llmutex.h +++ b/indra/llcommon/llmutex.h @@ -30,18 +30,9 @@ #include "stdtypes.h" #include <boost/noncopyable.hpp> -#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 - //============================================================================ #define MUTEX_DEBUG (LL_DEBUG || LL_RELEASE_WITH_DEBUG_INFO) |