diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-12-02 15:40:02 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 15:28:17 -0400 |
| commit | 7915dc45624e714706c497b45b5f2b663fa0cdc2 (patch) | |
| tree | 86ada907d356c14caa06d61a2dbd5f90f2e62c5c /indra | |
| parent | 9d5b897600a8f9405ec37a141b9417f34a11c557 (diff) | |
DRTVWR-494: Quiet VS warnings about its own <mutex> header.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llinstancetracker.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h index 76b201ad8c..3c8a5e3fb6 100644 --- a/indra/llcommon/llinstancetracker.h +++ b/indra/llcommon/llinstancetracker.h @@ -32,10 +32,20 @@ #include <set> #include <vector> #include <typeinfo> -#include <mutex> #include <memory> #include <type_traits> +#if LL_WINDOWS +#pragma warning (push) +#pragma warning (disable:4265) +#endif +// 'std::_Pad' : class has virtual functions, but destructor is not virtual +#include <mutex> + +#if LL_WINDOWS +#pragma warning (pop) +#endif + #include <boost/iterator/transform_iterator.hpp> #include <boost/iterator/indirect_iterator.hpp> #include <boost/iterator/filter_iterator.hpp> |