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

ENH: fix win64 build and a warning

Browse Source
This commit is contained in:
Bill Hoffman 2008-02-01 11:09:39 -05:00
parent 41ad9d20df
commit 32409bb8e3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/kwsys/SystemInformation.cxx
View File

@ -801,7 +801,7 @@ bool SystemInformationImplementation::DoesCPUSupportCPUID()
{
int CPUIDPresent = 0;
#if defined(_MSC_VER) && (_MSC_VER >= 1300)
#if USE_ASM_INSTRUCTIONS
// Use SEH to determine CPUID presence
__try {
_asm {
@ -842,7 +842,7 @@ bool SystemInformationImplementation::DoesCPUSupportCPUID()
bool SystemInformationImplementation::RetrieveCPUFeatures()
{
#if defined(_MSC_VER) && (_MSC_VER >= 1300)
#if USE_ASM_INSTRUCTIONS
int localCPUFeatures = 0;
int localCPUAdvanced = 0;
@ -2761,7 +2761,7 @@ kwsys_stl::string SystemInformationImplementation::RunProcess(kwsys_stl::vector<
}
kwsysProcess_WaitForExit(gp, 0);
int result = 1;
int result = 0;
switch(kwsysProcess_GetState(gp))
{
case kwsysProcess_State_Exited:
@ -2790,7 +2790,10 @@ kwsys_stl::string SystemInformationImplementation::RunProcess(kwsys_stl::vector<
} break;
}
kwsysProcess_Delete(gp);
(void)result;
if(result)
{
kwsys_ios::cerr << "Error " << args[0] << " returned :" << result << "\n";
}
return buffer;
}