diff options
| -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> |