diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-01-15 18:31:17 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-01-15 18:31:17 +0200 |
| commit | fa15830e02ed249186625e845e2ac19749d10193 (patch) | |
| tree | 645e4916d97b28f678ca57810e9ecc19b5dd551b /indra/llcommon/llqueuedthread.h | |
| parent | 346fc435f1b12e47b8bf51d15c70ceca4615de41 (diff) | |
SL-10291 Replace apr_atomic with standard C++11 functionality
Diffstat (limited to 'indra/llcommon/llqueuedthread.h')
| -rw-r--r-- | indra/llcommon/llqueuedthread.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llqueuedthread.h b/indra/llcommon/llqueuedthread.h index d3704b0fe2..5d3f873646 100644 --- a/indra/llcommon/llqueuedthread.h +++ b/indra/llcommon/llqueuedthread.h @@ -32,7 +32,7 @@ #include <map> #include <set> -#include "llapr.h" +#include "llatomic.h" #include "llthread.h" #include "llsimplehash.h" @@ -128,7 +128,7 @@ public: }; protected: - LLAtomic32<status_t> mStatus; + LLAtomicBase<status_t> mStatus; U32 mPriority; U32 mFlags; }; @@ -198,7 +198,7 @@ public: protected: BOOL mThreaded; // if false, run on main thread and do updates during update() BOOL mStarted; // required when mThreaded is false to call startThread() from update() - LLAtomic32<BOOL> mIdleThread; // request queue is empty (or we are quitting) and the thread is idle + LLAtomicBool mIdleThread; // request queue is empty (or we are quitting) and the thread is idle typedef std::set<QueuedRequest*, queued_request_less> request_queue_t; request_queue_t mRequestQueue; |