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/llsingleton.h | |
| parent | 0c42f50d6ba2d9cb5ee164e186572ffc7a8dbedf (diff) | |
DRTVWR-494: Encapsulate redundant VS boilerplate around <mutex>.
Diffstat (limited to 'indra/llcommon/llsingleton.h')
| -rw-r--r-- | indra/llcommon/llsingleton.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h index 8dec8bfb3b..4efffde43a 100644 --- a/indra/llcommon/llsingleton.h +++ b/indra/llcommon/llsingleton.h @@ -30,18 +30,7 @@ #include <list> #include <vector> #include <typeinfo> - -#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 +#include "mutex.h" class LLSingletonBase: private boost::noncopyable { |