From cd5a0546b08f538f70f56373d44f25d91b74895c Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sat, 20 May 2006 05:38:23 +0000 Subject: [PATCH] Fix compile on newer gcc. --- stepmania/src/NetworkSyncServer.h | 2 +- stepmania/src/RageUtil_FileDB.h | 4 ++-- stepmania/src/StdString.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/NetworkSyncServer.h b/stepmania/src/NetworkSyncServer.h index d0347a3946..a0813f807b 100644 --- a/stepmania/src/NetworkSyncServer.h +++ b/stepmania/src/NetworkSyncServer.h @@ -126,7 +126,7 @@ private: void GameOver(PacketFunctions& Packet, const unsigned int clientNum); void ScreenNetMusicSelectStatus(PacketFunctions& Packet, const unsigned int clientNum); void AnalizeChat(PacketFunctions &Packet, const unsigned int clientNum); - RString StepManiaLanServer::ListPlayers(); + RString ListPlayers(); void Kick(RString &name); void Ban(RString &name); bool IsBanned(RString &ip); diff --git a/stepmania/src/RageUtil_FileDB.h b/stepmania/src/RageUtil_FileDB.h index 9ceef36b7c..91aed17c7c 100644 --- a/stepmania/src/RageUtil_FileDB.h +++ b/stepmania/src/RageUtil_FileDB.h @@ -82,9 +82,9 @@ struct FileSet class FilenameDB { public: - FilenameDB::FilenameDB(): + FilenameDB(): m_Mutex("FilenameDB"), ExpireSeconds( -1 ) { } - virtual FilenameDB::~FilenameDB() { FlushDirCache(); } + virtual ~FilenameDB() { FlushDirCache(); } void AddFile( const RString &sPath, int iSize, int iHash, void *pPriv=NULL ); void DelFile( const RString &sPath ); diff --git a/stepmania/src/StdString.h b/stepmania/src/StdString.h index 82720962ad..30be9897ab 100644 --- a/stepmania/src/StdString.h +++ b/stepmania/src/StdString.h @@ -878,7 +878,7 @@ public: while ( (nIdx=this->find(szOld, nIdx)) != MYBASE::npos ) { - replace(this->begin()+nIdx, this->begin()+nIdx+nOldLen, szRealNew); + MYBASE::replace(this->begin()+nIdx, this->begin()+nIdx+nOldLen, szRealNew); nReplaced++; nIdx += nNewLen; }