From 79b21dcce3b8f4f7c78c77eea24e0878c978eae3 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 15 Feb 2006 04:10:46 +0000 Subject: [PATCH] fix VC6 clear() hack --- stepmania/src/StdString.h | 2 +- stepmania/src/archutils/Win32/CrashHandlerNetworking.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/StdString.h b/stepmania/src/StdString.h index b48a4f6c0f..79ff7e74c3 100644 --- a/stepmania/src/StdString.h +++ b/stepmania/src/StdString.h @@ -544,7 +544,7 @@ public: #endif /* VC6 string is missing clear(). */ - #if defined(_MSC_VER) && ( _MSC_VER < 1200 ) + #if defined(_MSC_VER) && ( _MSC_VER < 1300 ) /* VC6, not VC7 */ void clear() { this->erase(); diff --git a/stepmania/src/archutils/Win32/CrashHandlerNetworking.cpp b/stepmania/src/archutils/Win32/CrashHandlerNetworking.cpp index 0d1091f1e6..757dd620db 100644 --- a/stepmania/src/archutils/Win32/CrashHandlerNetworking.cpp +++ b/stepmania/src/archutils/Win32/CrashHandlerNetworking.cpp @@ -674,7 +674,7 @@ void NetworkPostData::HttpThread() RString sResult; while( m_pStream->GetState() == NetworkStream::STATE_CONNECTED ) { - sBuf.erase( sBuf.begin(), sBuf.end() ); + sBuf.clear(); void *p = sBuf.GetBuffer( 1024 ); int iGot = m_pStream->Read( p, 1024 ); if( iGot >= 0 ) @@ -713,7 +713,7 @@ void NetworkPostData::Start( const RString &sHost, int iPort, const RString &sPa m_sHost = sHost; m_iPort = iPort; m_sPath = sPath; - m_sStatus.erase( m_sStatus.begin(), m_sStatus.end() ); + m_sStatus.clear(); m_fProgress = 0; m_Thread.SetName( "HTTP thread" );