summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKWSys Upstream <kwrobot@kitware.com>2016-03-29 18:28:37 (GMT)
committerBrad King <brad.king@kitware.com>2016-03-29 18:29:42 (GMT)
commit735c41ddb021a5ca0e8957591447acdb28a0f41b (patch)
tree82909b933a16bafcc760807a3481d04b1f5d6053
parentcd4fef3041be85e1ec9139a91efa8a96f74707c5 (diff)
downloadCMake-735c41ddb021a5ca0e8957591447acdb28a0f41b.zip
CMake-735c41ddb021a5ca0e8957591447acdb28a0f41b.tar.gz
CMake-735c41ddb021a5ca0e8957591447acdb28a0f41b.tar.bz2
KWSys 2016-03-29 (b51abb30)
Code extracted from: http://public.kitware.com/KWSys.git at commit b51abb307d3b40957cc508aa54d449d9b41f5537 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 069a6b37 windows: check for _WIN32 rather than WIN32 Felix Geyer (1): b51abb30 SystemInformation: Fix spelling typos in comments
-rw-r--r--RegularExpression.cxx2
-rw-r--r--RegularExpression.hxx.in4
-rw-r--r--SystemInformation.cxx8
-rw-r--r--testEncoding.cxx2
4 files changed, 8 insertions, 8 deletions
diff --git a/RegularExpression.cxx b/RegularExpression.cxx
index 598e7ca..22593b4 100644
--- a/RegularExpression.cxx
+++ b/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/RegularExpression.hxx.in b/RegularExpression.hxx.in
index d0235d8..0bb700f 100644
--- a/RegularExpression.hxx.in
+++ b/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/SystemInformation.cxx b/SystemInformation.cxx
index 512d5fb..81fb2f9 100644
--- a/SystemInformation.cxx
+++ b/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/testEncoding.cxx b/testEncoding.cxx
index 842b17d..80ec040 100644
--- a/testEncoding.cxx
+++ b/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