diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 17:38:13 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 17:38:13 -0700 |
| commit | cd6044ed7a52e68e6050130ac2e9a637b8b7f339 (patch) | |
| tree | 2295f1b2afce6815aec4b80ff447d65de31a67b4 /indra/llcommon/llinstancetracker.h | |
| parent | 22fc3409f4606459c6df219c343a002fc53a35cd (diff) | |
| parent | 42fa05bd4cd8d587af4c216faca5e8c010812c8b (diff) | |
Merge viewer-release 6.2.2
Diffstat (limited to 'indra/llcommon/llinstancetracker.h')
| -rw-r--r-- | indra/llcommon/llinstancetracker.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h index 910c8dbd99..363d0bcbd5 100644 --- a/indra/llcommon/llinstancetracker.h +++ b/indra/llcommon/llinstancetracker.h @@ -28,6 +28,7 @@ #ifndef LL_LLINSTANCETRACKER_H #define LL_LLINSTANCETRACKER_H +#include <atomic> #include <map> #include <typeinfo> @@ -81,8 +82,12 @@ protected: void decrementDepth(); U32 getDepth(); private: - U32 sIterationNestDepth; - }; +#ifdef LL_WINDOWS + std::atomic_uint32_t sIterationNestDepth; +#else + std::atomic_uint sIterationNestDepth; +#endif + }; }; LL_COMMON_API void assert_main_thread(); |