kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-warning-char-string-constant' 

0bb22cf Avoid passing string literal to char* type
This commit is contained in:
Brad King 2011-01-04 15:44:11 -05:00 committed by CMake Topic Stage
parent 3556ab9f72 0bb22cfabe
commit 0de5db7554
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmGlobalVisualStudioGenerator.cxx
View File

@ -611,8 +611,9 @@ void WriteVSMacrosFileRegistryEntry(
{ {
// Create the subkey and set the values of interest: // Create the subkey and set the values of interest:
HKEY hsubkey = NULL; HKEY hsubkey = NULL;
result = RegCreateKeyEx(hkey, nextAvailableSubKeyName.c_str(), 0, "", 0, char lpClass[] = "";
KEY_READ|KEY_WRITE, 0, &hsubkey, 0); result = RegCreateKeyEx(hkey, nextAvailableSubKeyName.c_str(), 0,
lpClass, 0, KEY_READ|KEY_WRITE, 0, &hsubkey, 0);
if (ERROR_SUCCESS == result) if (ERROR_SUCCESS == result)
{ {
DWORD dw = 0; DWORD dw = 0;

3
Source/cmWin32ProcessExecution.cxx
View File

@ -290,7 +290,8 @@ static BOOL RealPopenCreateProcess(const char *cmdstring,
{ {
PROCESS_INFORMATION piProcInfo; PROCESS_INFORMATION piProcInfo;
STARTUPINFO siStartInfo; STARTUPINFO siStartInfo;
char *s1=0,*s2=0, *s3 = " /c "; char *s1=0,*s2=0;
const char *s3 = " /c ";
int i = GetEnvironmentVariable("COMSPEC",NULL,0); int i = GetEnvironmentVariable("COMSPEC",NULL,0);
if (i) if (i)
{ {