Merge pull request #1984 from FooBarbarians/fix-1912

Reordering initialization methods #1912
This commit is contained in:
Areloch 2017-04-26 01:11:51 -05:00 committed by GitHub
commit 19dcfde60f
70 changed files with 207 additions and 205 deletions

View file

@ -39,10 +39,10 @@ ThreadPool::Context ThreadPool::Context::smRootContext( "ROOT", NULL, 1.0 );
//--------------------------------------------------------------------------
ThreadPool::Context::Context( const char* name, ThreadPool::Context* parent, F32 priorityBias )
: mName( name ),
mParent( parent ),
mSibling( 0 ),
: mParent( parent ),
mName( name ),
mChildren( 0 ),
mSibling( 0 ),
mPriorityBias( priorityBias ),
mAccumulatedPriorityBias( 0.0 )
{
@ -215,8 +215,8 @@ private:
};
ThreadPool::WorkerThread::WorkerThread( ThreadPool* pool, U32 index )
: mPool( pool ),
mIndex( index )
: mIndex( index ),
mPool( pool )
{
// Link us to the pool's thread list.
@ -311,8 +311,8 @@ ThreadPool::ThreadPool( const char* name, U32 numThreads )
mNumThreads( numThreads ),
mNumThreadsAwake( 0 ),
mNumPendingItems( 0 ),
mThreads( 0 ),
mSemaphore( 0 )
mSemaphore( 0 ),
mThreads( 0 )
{
// Number of worker threads to create.