Index: src/libchcore/TString.cpp
===================================================================
diff -u -N -re9926b6e83984d0f30bf2008b93874c7c483d95c -r5fd6beaad9f1eccb664b997d151acb59961e4827
--- src/libchcore/TString.cpp	(.../TString.cpp)	(revision e9926b6e83984d0f30bf2008b93874c7c483d95c)
+++ src/libchcore/TString.cpp	(.../TString.cpp)	(revision 5fd6beaad9f1eccb664b997d151acb59961e4827)
@@ -87,7 +87,7 @@
 	{
 		TInternalStringData* pStringData = TInternalStringData::Allocate(stNewSize);
 
-		size_t stDataToCopy = min(pStringData->m_stBufferSize - 1, m_stStringLength);
+		size_t stDataToCopy = std::min(pStringData->m_stBufferSize - 1, m_stStringLength);
 
 		// copy as much data from the current buffer as possible
 		wcsncpy_s(pStringData->GetData(), pStringData->m_stBufferSize, GetData(), stDataToCopy);
@@ -358,7 +358,7 @@
 	if(tStart >= stCurrentLength)
 		return TString();
 
-	size_t stRealLength = min(tLen, stCurrentLength - tStart);
+	size_t stRealLength = std::min(tLen, stCurrentLength - tStart);
 
 	TString strNew(m_pszStringData + tStart, stRealLength);
 
@@ -437,7 +437,7 @@
 	}
 	else
 	{
-		size_t stRealLength = min(tLen, stCurrentLength - tStart);
+		size_t stRealLength = std::min(tLen, stCurrentLength - tStart);
 
 		EnsureWritable(stRealLength + 1);
 		wmemmove(m_pszStringData, m_pszStringData + tStart, stRealLength);
@@ -473,7 +473,7 @@
 
 	EnsureWritable(stCurrentLength + 1);
 
-	size_t stCountToDelete = min(stCurrentLength - stIndex, stCount);
+	size_t stCountToDelete = std::min(stCurrentLength - stIndex, stCount);
 
 	wmemmove(m_pszStringData + stIndex, m_pszStringData + stIndex + stCountToDelete, stCurrentLength - stCountToDelete);
 	m_pszStringData[stCurrentLength - stCountToDelete] = _T('\0');