[Winmerge-svn] SF.net SVN: winmerge:[7391] branches/R2_14/Src/FileTransform.cpp

[<jt...@us...>]

Revision: 7391
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7391&view=rev
Author:   jtuc
Date:     2010-10-31 15:03:57 +0000 (Sun, 31 Oct 2010)

Log Message:
-----------
Merge from trunk: GetSysError(nerr) -> GetSysError(nerr).c_str()

Modified Paths:
--------------
    branches/R2_14/Src/FileTransform.cpp

Modified: branches/R2_14/Src/FileTransform.cpp
===================================================================
--- branches/R2_14/Src/FileTransform.cpp	2010-10-31 14:55:42 UTC (rev 7390)
+++ branches/R2_14/Src/FileTransform.cpp	2010-10-31 15:03:57 UTC (rev 7391)
@@ -449,7 +449,7 @@
 			if (!::DeleteFile(filepath.c_str()))
 			{
 				LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-					filepath.c_str(), GetSysError(GetLastError())));
+					filepath.c_str(), GetSysError(GetLastError()).c_str()));
 			}
 		}
 		// and change the filepath if everything works
@@ -460,7 +460,7 @@
 		if (!::DeleteFile(tempFilepath.c_str()))
 		{
 			LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-				tempFilepath.c_str(), GetSysError(GetLastError())));
+				tempFilepath.c_str(), GetSysError(GetLastError()).c_str()));
 		}
 	}
 
@@ -495,7 +495,7 @@
 			if (!::DeleteFile(filepath.c_str()))
 			{
 				LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-					filepath.c_str(), GetSysError(GetLastError())));
+					filepath.c_str(), GetSysError(GetLastError()).c_str()));
 			}
 		}
 		// and change the filepath if everything works
@@ -506,7 +506,7 @@
 		if (!::DeleteFile(tempFilepath.c_str()))
 		{
 			LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-				tempFilepath.c_str(), GetSysError(GetLastError())));
+				tempFilepath.c_str(), GetSysError(GetLastError()).c_str()));
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.