diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 11:04:56 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 11:04:56 -0600 |
| commit | 19d063952c4706d4344f207775aa5dfdff8802fd (patch) | |
| tree | 596d38d591177ccc2ffef695b6f79437c5efce97 /indra/llcommon/mutex.h | |
| parent | 6362aa300766484909cdfc8884edf3e6744fc727 (diff) | |
| parent | 72423372d6cd7f763a5567ad75752fa4e7131d60 (diff) | |
Merge master 6.4.6 into DRTVWR-510
Includes the conversion to VS2017 build tools.
Diffstat (limited to 'indra/llcommon/mutex.h')
| -rw-r--r-- | indra/llcommon/mutex.h | 22 |
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 |