actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/RageLog.cpp
+3 -4
View File
@@ -4,7 +4,6 @@
#include "RageTimer.h"
#include "RageFile.h"
#include "RageThreads.h"
#include "Foreach.h"
#include <ctime>
#if defined(_WINDOWS)
@@ -374,7 +373,7 @@ void RageLog::AddToRecentLogs( const RString &str )
const char *RageLog::GetRecentLog( int n )
{
if( n >= BACKLOG_LINES || n >= backlog_cnt )
return NULL;
return nullptr;
if( backlog_cnt == BACKLOG_LINES )
{
@@ -394,8 +393,8 @@ static int g_AdditionalLogSize = 0;
void RageLog::UpdateMappedLog()
{
RString str;
FOREACHM_CONST( RString, RString, LogMaps, i )
str += ssprintf( "%s" NEWLINE, i->second.c_str() );
for (auto const &i : LogMaps)
str += ssprintf( "%s" NEWLINE, i.second.c_str() );
g_AdditionalLogSize = min( sizeof(g_AdditionalLogStr), str.size()+1 );
memcpy( g_AdditionalLogStr, str.c_str(), g_AdditionalLogSize );