diff options
author | Callum Prentice <callum@mbp.localdomain> | 2023-01-26 10:37:59 -0800 |
---|---|---|
committer | Callum Prentice <callum@mbp.localdomain> | 2023-01-26 10:37:59 -0800 |
commit | fb00bce81ad201b5f1798ff5d5afe8c4dcabda54 (patch) | |
tree | a157a9f0ec2648cf7d2281a8019b52b8468111f9 /indra/llcommon/llqueuedthread.h | |
parent | 66f59478d09122ddf43c4ba3445754d1698bf016 (diff) | |
parent | f3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff) |
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
Diffstat (limited to 'indra/llcommon/llqueuedthread.h')
-rw-r--r-- | indra/llcommon/llqueuedthread.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llqueuedthread.h b/indra/llcommon/llqueuedthread.h index 5d3f873646..90fce3dc5d 100644 --- a/indra/llcommon/llqueuedthread.h +++ b/indra/llcommon/llqueuedthread.h @@ -167,19 +167,19 @@ private: protected: handle_t generateHandle(); bool addRequest(QueuedRequest* req); - S32 processNextRequest(void); + size_t processNextRequest(void); void incQueue(); public: bool waitForResult(handle_t handle, bool auto_complete = true); - virtual S32 update(F32 max_time_ms); - S32 updateQueue(F32 max_time_ms); - + virtual size_t update(F32 max_time_ms); + size_t updateQueue(F32 max_time_ms); + void waitOnPending(); void printQueueStats(); - virtual S32 getPending(); + virtual size_t getPending(); bool getThreaded() { return mThreaded ? true : false; } // Request accessors |