From 4a8477b633364d4533ad8e0d9a28864d0e799f4b Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 6 Apr 2009 04:11:59 -0500 Subject: Converted BOOLs to bools in llthread. --- linden/indra/llcommon/llthread.cpp | 10 +++++----- linden/indra/llcommon/llthread.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'linden') diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp index 822adc2..4879d58 100644 --- a/linden/indra/llcommon/llthread.cpp +++ b/linden/indra/llcommon/llthread.cpp @@ -84,7 +84,7 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap LLThread::LLThread(const std::string& name, apr_pool_t *poolp) : - mPaused(FALSE), + mPaused(false), mName(name), mAPRThreadp(NULL), mStatus(STOPPED) @@ -92,12 +92,12 @@ LLThread::LLThread(const std::string& name, apr_pool_t *poolp) : // Thread creation probably CAN be paranoid about APR being initialized, if necessary if (poolp) { - mIsLocalPool = FALSE; + mIsLocalPool = false; mAPRPoolp = poolp; } else { - mIsLocalPool = TRUE; + mIsLocalPool = true; apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread } mRunCondition = new LLCondition(mAPRPoolp); @@ -268,12 +268,12 @@ LLMutex::LLMutex(apr_pool_t *poolp) : { //if (poolp) //{ - // mIsLocalPool = FALSE; + // mIsLocalPool = false; // mAPRPoolp = poolp; //} //else { - mIsLocalPool = TRUE; + mIsLocalPool = true; apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread } apr_thread_mutex_create(&mAPRMutexp, APR_THREAD_MUTEX_UNNESTED, mAPRPoolp); diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h index 9da3134..a0b22f2 100644 --- a/linden/indra/llcommon/llthread.h +++ b/linden/indra/llcommon/llthread.h @@ -67,7 +67,7 @@ public: // Called from MAIN THREAD. void pause(); void unpause(); - bool isPaused() { return isStopped() || mPaused == TRUE; } + bool isPaused() { return isStopped() || mPaused; } // Cause the thread to wake up and check its condition void wake(); @@ -84,7 +84,7 @@ public: apr_pool_t *getAPRPool() { return mAPRPoolp; } private: - BOOL mPaused; + bool mPaused; // static function passed to APR thread creation routine static void *APR_THREAD_FUNC staticRun(apr_thread_t *apr_threadp, void *datap); @@ -95,7 +95,7 @@ protected: apr_thread_t *mAPRThreadp; apr_pool_t *mAPRPoolp; - BOOL mIsLocalPool; + bool mIsLocalPool; EThreadStatus mStatus; void setQuitting(); @@ -137,7 +137,7 @@ public: protected: apr_thread_mutex_t *mAPRMutexp; apr_pool_t *mAPRPoolp; - BOOL mIsLocalPool; + bool mIsLocalPool; }; // Actually a condition/mutex pair (since each condition needs to be associated with a mutex). -- cgit v1.1