Integrate C++11 branch into 5_1-new

This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
444 changed files with 19503 additions and 21007 deletions
+1 -2
View File
@@ -2,7 +2,6 @@
#include "RageSoundReader_ThreadedBuffer.h"
#include "RageUtil.h"
#include "RageTimer.h"
#include "Foreach.h"
#include "RageLog.h"
/* Implement threaded read-ahead buffering.
@@ -48,7 +47,7 @@ RageSoundReader_ThreadedBuffer::RageSoundReader_ThreadedBuffer( RageSoundReader
}
RageSoundReader_ThreadedBuffer::RageSoundReader_ThreadedBuffer( const RageSoundReader_ThreadedBuffer &cpy ):
RageSoundReader_Filter( NULL ), // don't touch m_pSource before DisableBuffering
RageSoundReader_Filter(nullptr), // don't touch m_pSource before DisableBuffering
m_Event( "ThreadedBuffer" )
{
bool bWasEnabled = cpy.DisableBuffering();