Index: src/libchcore/TString.cpp
===================================================================
diff -u -N -re8f31b0f922b402878356e130c866c4f3682a7f5 -r8d3154738b885f2e01997071e6180da0c4b8cc7c
--- src/libchcore/TString.cpp	(.../TString.cpp)	(revision e8f31b0f922b402878356e130c866c4f3682a7f5)
+++ src/libchcore/TString.cpp	(.../TString.cpp)	(revision 8d3154738b885f2e01997071e6180da0c4b8cc7c)
@@ -65,15 +65,15 @@
 	{
 		// we support either both arguments != NULL or both == NULL
 		if (pszEnd != NULL && pszStart == NULL || pszEnd == NULL && pszStart != NULL)
-			THROW_STRING_EXCEPTION(eErr_InvalidArgument, _T("End of string specified while start is NULL"));
+			throw TStringException(eErr_InvalidArgument, _T("End of string specified while start is NULL"), LOCATION);
 
 		// sanity check
 		if (pszEnd < pszStart)
-			THROW_STRING_EXCEPTION(eErr_InvalidArgument, _T("Paradox: string begins after its end"));
+			throw TStringException(eErr_InvalidArgument, _T("Paradox: string begins after its end"), LOCATION);
 
 		size_t stCount = pszEnd - pszStart;
 		if (stCount > stMaxStringSize)
-			THROW_STRING_EXCEPTION(eErr_InvalidArgument, _T("Exceeded maximum expected string size"));
+			throw TStringException(eErr_InvalidArgument, _T("Exceeded maximum expected string size"), LOCATION);
 
 		SetString(pszStart, stCount);
 	}
@@ -83,7 +83,7 @@
 		m_stBufferSize(0)
 	{
 		if (!pszStart)
-			THROW_STRING_EXCEPTION(eErr_InvalidArgument, _T("String not specified"));
+			throw TStringException(eErr_InvalidArgument, _T("String not specified"), LOCATION);
 
 		if (stCount == 0)
 			return;