Merge branch 'upstream-KWSys' into update-kwsys

* upstream-KWSys:
  KWSys 2016-03-29 (b51abb30)
This commit is contained in:
Brad King 2016-03-29 14:29:42 -04:00
commit dc333a7115
4 changed files with 8 additions and 8 deletions

View File

@ -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];

View File

@ -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;

View File

@ -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;
}
}

View File

@ -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