From a9646af68d37c51c6cd1592521c7400a307c4b5f Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 2 May 2008 09:14:37 -0400
Subject: [PATCH] COMP: Fix warnings in KWSys SystemInformation on Borland
compiler.
- Remove two unused variables.
- Replace dynamically allocated array with static.
---
SystemInformation.cxx | 20 ++++++++------------
kwsysDateStamp.cmake | 4 ++--
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 2a5555b..d294f2a 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -799,8 +799,6 @@ void SystemInformationImplementation::Delay(unsigned int uiMS)
bool SystemInformationImplementation::DoesCPUSupportCPUID()
{
- int CPUIDPresent = 0;
-
#if USE_ASM_INSTRUCTIONS
// Use SEH to determine CPUID presence
__try {
@@ -829,15 +827,15 @@ bool SystemInformationImplementation::DoesCPUSupportCPUID()
__except(1)
{
// Stop the class from trying to use CPUID again!
- CPUIDPresent = false;
return false;
}
+
+ // The cpuid instruction succeeded.
+ return true;
#else
- CPUIDPresent = false;
+ // Assume no cpuid instruction.
+ return false;
#endif
-
- // Return true to indicate support or false to indicate lack.
- return (CPUIDPresent == 0) ? true : false;
}
bool SystemInformationImplementation::RetrieveCPUFeatures()
@@ -2586,13 +2584,13 @@ int SystemInformationImplementation::CPUCount()
// number of logical processors.
unsigned int i = 1;
unsigned char PHY_ID_MASK = 0xFF;
- unsigned char PHY_ID_SHIFT = 0;
+ //unsigned char PHY_ID_SHIFT = 0;
while (i < this->NumberOfLogicalCPU)
{
i *= 2;
PHY_ID_MASK <<= 1;
- PHY_ID_SHIFT++;
+ // PHY_ID_SHIFT++;
}
hCurrentProcessHandle = GetCurrentProcess();
@@ -2922,7 +2920,7 @@ bool SystemInformationImplementation::QueryOSInformation()
OSVERSIONINFOEX osvi;
BOOL bIsWindows64Bit;
BOOL bOsVersionInfoEx;
- char * operatingSystem = new char [256];
+ char operatingSystem[256];
// Try calling GetVersionEx using the OSVERSIONINFOEX structure.
ZeroMemory (&osvi, sizeof (OSVERSIONINFOEX));
@@ -3117,8 +3115,6 @@ bool SystemInformationImplementation::QueryOSInformation()
this->OSRelease = "Unknown";
break;
}
- delete [] operatingSystem;
- operatingSystem = 0;
// Get the hostname
WORD wVersionRequested;
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 2268c16..60dbef1 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -4,7 +4,7 @@
SET(KWSYS_DATE_STAMP_YEAR 2008)
# KWSys version date month component. Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 04)
+SET(KWSYS_DATE_STAMP_MONTH 05)
# KWSys version date day component. Format is DD.
-SET(KWSYS_DATE_STAMP_DAY 30)
+SET(KWSYS_DATE_STAMP_DAY 02)
--
GitLab