actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSoundReader_FileReader.h
+2 -2
View File
@@ -31,10 +31,10 @@ public:
virtual float GetStreamToSourceRatio() const { return 1.0f; }
virtual RString GetError() const { return m_sError; }
/* Open a file. If pPrebuffer is non-NULL, and the file is sufficiently small,
/* Open a file. If pPrebuffer is non-nullptr, and the file is sufficiently small,
* the (possibly compressed) data will be loaded entirely into memory, and pPrebuffer
* will be set to true. */
static RageSoundReader_FileReader *OpenFile( RString filename, RString &error, bool *pPrebuffer = NULL );
static RageSoundReader_FileReader *OpenFile( RString filename, RString &error, bool *pPrebuffer = nullptr );
protected:
void SetError( RString sError ) const { m_sError = sError; }