Index: src/libchcore/TString.cpp
===================================================================
diff -u -N -r7b830c34855c8aaa81aac2c6e0ca0fa6bae95e66 -r2fe97a93f21771d75901d4b6559057d1ea055104
--- src/libchcore/TString.cpp	(.../TString.cpp)	(revision 7b830c34855c8aaa81aac2c6e0ca0fa6bae95e66)
+++ src/libchcore/TString.cpp	(.../TString.cpp)	(revision 2fe97a93f21771d75901d4b6559057d1ea055104)
@@ -661,16 +661,6 @@
 	m_pszData[tSize] = L'\0';
 }
 
-/** Cast operator - tries to return a pointer to wchar_t* using the current internal
- *  buffer. If the internal buffer is in ansi format, then the debug version asserts
- *  and release return NULL.
- * \return Pointer to an unicode TString (could be null).
- */
-TString::operator const wchar_t*() const
-{
-	return m_pszData ? m_pszData : L"";
-}
-
 void TString::SetString(const wchar_t* pszStart, size_t stCount)
 {
 	if(!pszStart || stCount == 0)
@@ -713,6 +703,11 @@
 	}
 }
 
+const wchar_t* TString::c_str() const
+{
+	return m_pszData ? m_pszData : L"";
+}
+
 END_CHCORE_NAMESPACE
 
 chcore::TString operator+(const wchar_t* pszString, const chcore::TString& str)