From 98dfba0d2f24aeb92e023df9d48b23fef8253024 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 14 May 2020 14:51:52 -0400 Subject: DRTVWR-476: Wrap boost::fibers::mutex et al. with LLCoros aliases. Specifically: LLCoros::Mutex means boost::fibers::mutex LLCoros::LockType means std::unique_lock LLCoros::ConditionVariable means boost::fibers::condition_variable LLCoros::cv_status means boost::fibers::cv_status So as not to drag in all of boost::fibers::mutex.hpp or condition_variable.hpp for each consumer of llcoros.h, instead #define LLCOROS_MUTEX_HEADER and LLCOROS_CONDVAR_HEADER. Those who need them can #include the relevant macro. Update llcond.h and llthreadsafequeue.h accordingly. --- indra/llcommon/llthreadsafequeue.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'indra/llcommon/llthreadsafequeue.h') diff --git a/indra/llcommon/llthreadsafequeue.h b/indra/llcommon/llthreadsafequeue.h index bac536f7ee..8f5e0f3bf3 100644 --- a/indra/llcommon/llthreadsafequeue.h +++ b/indra/llcommon/llthreadsafequeue.h @@ -31,7 +31,8 @@ #include #include #include "mutex.h" -#include +#include "llcoros.h" +#include LLCOROS_CONDVAR_HEADER // // A general queue exception. @@ -119,10 +120,10 @@ private: U32 mCapacity; bool mClosed; - boost::fibers::mutex mLock; - typedef std::unique_lock lock_t; - boost::fibers::condition_variable mCapacityCond; - boost::fibers::condition_variable mEmptyCond; + LLCoros::Mutex mLock; + typedef LLCoros::LockType lock_t; + LLCoros::ConditionVariable mCapacityCond; + LLCoros::ConditionVariable mEmptyCond; }; // LLThreadSafeQueue -- cgit v1.3