diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:28:15 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:28:15 +0200 |
| commit | 27e197459da275d2cd8847aa36e6c6bc4720e5c5 (patch) | |
| tree | fccc0ceaac90e03939d37e54cb8519a0132993cf /indra/llcommon/llqueuedthread.h | |
| parent | 1a1465dab94a2829cedb4ee4cd0c0169cea0fdeb (diff) | |
| parent | 2ab914a9cdd1ad809879aca05dbf4b624949ecea (diff) | |
Merge
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; |