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

Merge topic 'update-kwsys' 

dc333a71 Merge branch 'upstream-KWSys' into update-kwsys
735c41dd KWSys 2016-03-29 (b51abb30)
This commit is contained in:
Brad King 2016-03-31 08:46:01 -04:00 committed by CMake Topic Stage
parent 189b54586b dc333a7115
commit dea0b6b718
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/kwsys/RegularExpression.cxx
View File

@ -376,7 +376,7 @@ bool RegularExpression::compile (const char* exp) {
} }
// Allocate space. // Allocate space.
//#ifndef WIN32 //#ifndef _WIN32
if (this->program != 0) delete [] this->program; if (this->program != 0) delete [] this->program;
//#endif //#endif
this->program = new char[regsize]; this->program = new char[regsize];

4
Source/kwsys/RegularExpression.hxx.in
View File

@ -333,7 +333,7 @@ inline RegularExpression::RegularExpression (const std::string& s)
*/ */
inline RegularExpression::~RegularExpression () inline RegularExpression::~RegularExpression ()
{ {
//#ifndef WIN32 //#ifndef _WIN32
delete [] this->program; delete [] this->program;
//#endif //#endif
} }
@ -396,7 +396,7 @@ inline bool RegularExpression::is_valid () const
inline void RegularExpression::set_invalid () inline void RegularExpression::set_invalid ()
{ {
//#ifndef WIN32 //#ifndef _WIN32
delete [] this->program; delete [] this->program;
//#endif //#endif
this->program = 0; this->program = 0;

8
Source/kwsys/SystemInformation.cxx
View File

@ -1583,7 +1583,7 @@ SystemInformationImplementation::~SystemInformationImplementation()
void SystemInformationImplementation::RunCPUCheck() void SystemInformationImplementation::RunCPUCheck()
{ {
#ifdef WIN32 #ifdef _WIN32
// Check to see if this processor supports CPUID. // Check to see if this processor supports CPUID.
bool supportsCPUID = DoesCPUSupportCPUID(); bool supportsCPUID = DoesCPUSupportCPUID();
@ -2056,7 +2056,7 @@ bool SystemInformationImplementation::DoesCPUSupportFeature(long int dwFeature)
void SystemInformationImplementation::Delay(unsigned int uiMS) void SystemInformationImplementation::Delay(unsigned int uiMS)
{ {
#ifdef WIN32 #ifdef _WIN32
LARGE_INTEGER Frequency, StartCounter, EndCounter; LARGE_INTEGER Frequency, StartCounter, EndCounter;
__int64 x; __int64 x;
@ -2339,7 +2339,7 @@ bool SystemInformationImplementation::RetrieveClassicalCPUCacheDetails()
case 13: TLBCacheUnit = ((TLBCacheData[3] & 0x00FF0000) >> 16); break; case 13: TLBCacheUnit = ((TLBCacheData[3] & 0x00FF0000) >> 16); break;
case 14: TLBCacheUnit = ((TLBCacheData[3] & 0xFF000000) >> 24); break; case 14: TLBCacheUnit = ((TLBCacheData[3] & 0xFF000000) >> 24); break;
// Default case - an error has occured. // Default case - an error has occurred.
default: return false; default: return false;
} }
@ -2401,7 +2401,7 @@ bool SystemInformationImplementation::RetrieveClassicalCPUCacheDetails()
case 0x96: STORE_TLBCACHE_INFO (TLBCode, 262144); break; // <-- FIXME: IA-64 Only case 0x96: STORE_TLBCACHE_INFO (TLBCode, 262144); break; // <-- FIXME: IA-64 Only
case 0x9b: STORE_TLBCACHE_INFO (TLBCode, 262144); break; // <-- FIXME: IA-64 Only case 0x9b: STORE_TLBCACHE_INFO (TLBCode, 262144); break; // <-- FIXME: IA-64 Only
// Default case - an error has occured. // Default case - an error has occurred.
default: return false; default: return false;
} }
} }

2
Source/kwsys/testEncoding.cxx
View File

@ -120,7 +120,7 @@ static int testRobustEncoding()
ret++; ret++;
} }
#ifdef WIN32 #ifdef _WIN32
// 16 bit wchar_t - we make an invalid surrogate pair // 16 bit wchar_t - we make an invalid surrogate pair
wchar_t cwstr[] = {0xD801, 0xDA00, 0}; wchar_t cwstr[] = {0xD801, 0xDA00, 0};
// this conversion could fail // this conversion could fail