[Winmerge-svn] SF.net SVN: winmerge:[7528] trunk/Src

[<sdo...@us...>]

Revision: 7528
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7528&view=rev
Author:   sdottaka
Date:     2011-05-24 16:04:55 +0000 (Tue, 24 May 2011)

Log Message:
-----------
Add missing .c_str()

Modified Paths:
--------------
    trunk/Src/Common/OptionsMgr.cpp
    trunk/Src/PropShell.cpp
    trunk/Src/locality.cpp

Modified: trunk/Src/Common/OptionsMgr.cpp
===================================================================
--- trunk/Src/Common/OptionsMgr.cpp	2011-05-23 13:54:11 UTC (rev 7527)
+++ trunk/Src/Common/OptionsMgr.cpp	2011-05-24 16:04:55 UTC (rev 7528)
@@ -283,7 +283,7 @@
 			if (ConvertType(value, m_value.GetType()))
 				return Set(value);
 		}
-		_RPTF1(_CRT_ERROR, "Wrong type for option: %s", m_strName);
+		_RPTF1(_CRT_ERROR, "Wrong type for option: %s", m_strName.c_str());
 		return OPT_WRONG_TYPE;
 	}
 
@@ -329,7 +329,7 @@
 	varprop::VT_TYPE inType = defaultValue.GetType();
 	if (inType != m_valueDef.GetType())
 	{
-		_RPTF1(_CRT_ERROR, "Wrong type for option: %s!", m_strName);
+		_RPTF1(_CRT_ERROR, "Wrong type for option: %s!", m_strName.c_str());
 		return OPT_WRONG_TYPE;
 	}
 

Modified: trunk/Src/PropShell.cpp
===================================================================
--- trunk/Src/PropShell.cpp	2011-05-23 13:54:11 UTC (rev 7527)
+++ trunk/Src/PropShell.cpp	2011-05-24 16:04:55 UTC (rev 7528)
@@ -103,7 +103,7 @@
 	{
 		CString msg;
 		msg.Format(_T("Failed to open registry key HKCU/%s:\n\t%d : %s"),
-			f_RegDir, retVal, GetSysError(retVal));
+			f_RegDir, retVal, GetSysError(retVal).c_str());
 		LogErrorString(msg);
 		return;
 	}
@@ -141,7 +141,7 @@
 	{
 		CString msg;
 		msg.Format(_T("Failed to open registry key HKCU/%s:\n\t%d : %s"),
-			f_RegDir, retVal, GetSysError(retVal));
+			f_RegDir, retVal, GetSysError(retVal).c_str());
 		LogErrorString(msg);
 		return;
 	}
@@ -152,7 +152,7 @@
 	{
 		CString msg;
 		msg.Format(_T("Failed to set registry value %s:\n\t%d : %s"),
-			f_RegValuePath, retVal, GetSysError(retVal));
+			f_RegValuePath, retVal, GetSysError(retVal).c_str());
 		LogErrorString(msg);
 	}
 
@@ -178,7 +178,7 @@
 	{
 		CString msg;
 		msg.Format(_T("Failed to set registry value %s to %d:\n\t%d : %s"),
-			f_RegValueEnabled, dwContextEnabled, retVal, GetSysError(retVal));
+			f_RegValueEnabled, dwContextEnabled, retVal, GetSysError(retVal).c_str());
 		LogErrorString(msg);
 	}
 }

Modified: trunk/Src/locality.cpp
===================================================================
--- trunk/Src/locality.cpp	2011-05-23 13:54:11 UTC (rev 7527)
+++ trunk/Src/locality.cpp	2011-05-24 16:04:55 UTC (rev 7528)
@@ -114,7 +114,7 @@
 	else
 	{
 		int nerr = GetLastError();
-		TRACE(_T("Error %d in NumToStr(): %s\n"), nerr, GetSysError(nerr));
+		TRACE(_T("Error %d in NumToStr(): %s\n"), nerr, GetSysError(nerr).c_str());
 		out = str;
 	}
 	return out;


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