Merge pull request #1984 from FooBarbarians/fix-1912

Reordering initialization methods #1912

Engine/source/platform/async/asyncBufferedStream.h

@@ -165,8 +165,8 @@ AsyncBufferedInputStream< T, Stream >::AsyncBufferedInputStream
             ThreadPool* threadPool,
             ThreadContext* threadContext )
    : Parent( stream ),
-     mIsStopped( false ),
      mIsLooping( isLooping ),
+     mIsStopped( false ),
      mNumRemainingSourceElements( numSourceElementsToRead ),
      mNumBufferedElements( 0 ),
      mMaxBufferedElements( numReadAhead ),

Engine/source/platform/async/asyncPacketStream.h

@@ -245,8 +245,8 @@ AsyncPacketBufferedInputStream< Stream, Packet >::AsyncPacketBufferedInputStream
             ThreadContext* threadContext )
    : Parent( stream, numSourceElementsToRead, numReadAhead, isLooping, threadPool, threadContext ),
      mPacketSize( packetSize ),
-     mNumTotalSourceElements( numSourceElementsToRead ),
-     mNextPacketIndex( 0 )
+     mNextPacketIndex( 0 ),
+     mNumTotalSourceElements( numSourceElementsToRead )
 {
    AssertFatal( mPacketSize > 0,
       "AsyncPacketStream::AsyncPacketStream() - packet size cannot be zero" );

Engine/source/platform/platformMemory.cpp

@@ -228,8 +228,8 @@ struct HeapIterator
 
    HeapIterator( bool allocatedOnly = true )
       : mCurrentPage( gPageList ),
-        mAllocatedOnly( allocatedOnly ),
-        mCurrentHeader( NULL )
+        mCurrentHeader( NULL ),
+        mAllocatedOnly( allocatedOnly )
    {
       if( mCurrentPage )
       {

Engine/source/platform/threads/threadPool.cpp

@@ -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.