diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-29 18:29:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-29 18:29:42 (GMT) |
| commit | dc333a7115a43e4e97a2ff3ba269a39526598f88 (patch) | |
| tree | 211bc3668cc319eed3ef361f370255d985796908 | |
| parent | 90f24f016e93d18f6a244b39fd21c68355bdbe48 (diff) | |
| parent | 735c41ddb021a5ca0e8957591447acdb28a0f41b (diff) | |
| download | CMake-dc333a7115a43e4e97a2ff3ba269a39526598f88.zip CMake-dc333a7115a43e4e97a2ff3ba269a39526598f88.tar.gz CMake-dc333a7115a43e4e97a2ff3ba269a39526598f88.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-03-29 (b51abb30)
| -rw-r--r-- | Source/kwsys/RegularExpression.cxx | 2 | ||||
| -rw-r--r-- | Source/kwsys/RegularExpression.hxx.in | 4 | ||||
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 8 | ||||
| -rw-r--r-- | Source/kwsys/testEncoding.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Source/kwsys/RegularExpression.cxx b/Source/kwsys/RegularExpression.cxx index 598e7ca..22593b4 100644 --- a/Source/kwsys/RegularExpression.cxx +++ b/Source/kwsys/RegularExpression.cxx @@ -376,7 +376,7 @@ bool RegularExpression::compile (const char* exp) { } // Allocate space. -//#ifndef WIN32 +//#ifndef _WIN32 if (this->program != 0) delete [] this->program; //#endif this->program = new char[regsize]; diff --git a/Source/kwsys/RegularExpression.hxx.in b/Source/kwsys/RegularExpression.hxx.in index d0235d8..0bb700f 100644 --- a/Source/kwsys/RegularExpression.hxx.in +++ b/Source/kwsys/RegularExpression.hxx.in @@ -333,7 +333,7 @@ inline RegularExpression::RegularExpression (const std::string& s) */ inline RegularExpression::~RegularExpression () { -//#ifndef WIN32 +//#ifndef _WIN32 delete [] this->program; //#endif } @@ -396,7 +396,7 @@ inline bool RegularExpression::is_valid () const inline void RegularExpression::set_invalid () { -//#ifndef WIN32 +//#ifndef _WIN32 delete [] this->program; //#endif this->program = 0; diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 512d5fb..81fb2f9 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -1583,7 +1583,7 @@ SystemInformationImplementation::~SystemInformationImplementation() void SystemInformationImplementation::RunCPUCheck() { -#ifdef WIN32 +#ifdef _WIN32 // Check to see if this processor supports CPUID. bool supportsCPUID = DoesCPUSupportCPUID(); @@ -2056,7 +2056,7 @@ bool SystemInformationImplementation::DoesCPUSupportFeature(long int dwFeature) void SystemInformationImplementation::Delay(unsigned int uiMS) { -#ifdef WIN32 +#ifdef _WIN32 LARGE_INTEGER Frequency, StartCounter, EndCounter; __int64 x; @@ -2339,7 +2339,7 @@ bool SystemInformationImplementation::RetrieveClassicalCPUCacheDetails() case 13: TLBCacheUnit = ((TLBCacheData[3] & 0x00FF0000) >> 16); break; case 14: TLBCacheUnit = ((TLBCacheData[3] & 0xFF000000) >> 24); break; - // Default case - an error has occured. + // Default case - an error has occurred. default: return false; } @@ -2401,7 +2401,7 @@ bool SystemInformationImplementation::RetrieveClassicalCPUCacheDetails() case 0x96: 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; } } diff --git a/Source/kwsys/testEncoding.cxx b/Source/kwsys/testEncoding.cxx index 842b17d..80ec040 100644 --- a/Source/kwsys/testEncoding.cxx +++ b/Source/kwsys/testEncoding.cxx @@ -120,7 +120,7 @@ static int testRobustEncoding() ret++; } -#ifdef WIN32 +#ifdef _WIN32 // 16 bit wchar_t - we make an invalid surrogate pair wchar_t cwstr[] = {0xD801, 0xDA00, 0}; // this conversion could fail |