ENH: figure out long long value

This commit is contained in:
Bill Hoffman 2008-01-08 17:51:05 -05:00
parent 91edea1b8d
commit 3777f4139d
2 changed files with 19 additions and 3 deletions

View File

@ -516,7 +516,7 @@ bool SystemInformation::RetrieveCPUIdentity()
{ {
#ifdef WIN32 #ifdef WIN32
int localCPUVendor[3]; int localCPUVendor[3];
int locallocalCPUSignature; int localCPUSignature;
// Use assembly to detect CPUID information... // Use assembly to detect CPUID information...
__try __try
@ -1946,7 +1946,7 @@ unsigned long SystemInformation::GetAvailablePhysicalMemory()
} }
/** Get Cycle differences */ /** Get Cycle differences */
long long SystemInformation::GetCyclesDifference (DELAY_FUNC DelayFunction, LongLong SystemInformation::GetCyclesDifference (DELAY_FUNC DelayFunction,
unsigned int uiParameter) unsigned int uiParameter)
{ {
#ifdef WIN32 #ifdef WIN32

View File

@ -91,6 +91,22 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/pstat.h> #include <sys/pstat.h>
#endif #endif
#include <@KWSYS_NAMESPACE@/FundamentalType.h>
#if @KWSYS_NAMESPACE@_USE_LONG_LONG
namespace @KWSYS_NAMESPACE@
{
typedef long long LongLong;
}
#elif @KWSYS_NAMESPACE@_USE_USE___INT64
namespace @KWSYS_NAMESPACE@
{
typedef __int64 LongLong;
}
#else
//# error "No Long long"
#endif
#include <@KWSYS_NAMESPACE@/stl/string> #include <@KWSYS_NAMESPACE@/stl/string>
#include <@KWSYS_NAMESPACE@/stl/vector> #include <@KWSYS_NAMESPACE@/stl/vector>
@ -238,7 +254,7 @@ protected:
unsigned char LogicalCPUPerPhysicalCPU(); unsigned char LogicalCPUPerPhysicalCPU();
unsigned char GetAPICId(); unsigned char GetAPICId();
unsigned int IsHyperThreadingSupported(); unsigned int IsHyperThreadingSupported();
long long GetCyclesDifference(DELAY_FUNC, unsigned int); LongLong GetCyclesDifference(DELAY_FUNC, unsigned int);
// For Linux // For Linux
int RetreiveInformationFromCpuInfoFile(); int RetreiveInformationFromCpuInfoFile();