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

Merge branch 'upstream-kwsys' into update-kwsys

This commit is contained in:
Brad King 2015-03-18 08:58:11 -04:00
parent a5cab2e739 bc67dbede9
commit 0e8325db66
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/kwsys/SystemInformation.cxx
View File

@ -1234,6 +1234,7 @@ void StacktraceSignalHandler(
case ILL_ILLTRP: case ILL_ILLTRP:
oss << "illegal trap"; oss << "illegal trap";
break;
case ILL_PRVOPC: case ILL_PRVOPC:
oss << "privileged opcode"; oss << "privileged opcode";
@ -1823,6 +1824,7 @@ const char * SystemInformationImplementation::GetVendorID()
return "Motorola"; return "Motorola";
case HP: case HP:
return "Hewlett-Packard"; return "Hewlett-Packard";
case UnknownManufacturer:
default: default:
return "Unknown Manufacturer"; return "Unknown Manufacturer";
} }
@ -3064,6 +3066,12 @@ bool SystemInformationImplementation::RetrieveClassicalCPUIdentity()
case NSC: case NSC:
this->ChipID.ProcessorName = "Cx486SLC \\ DLC \\ Cx486S A-Step"; this->ChipID.ProcessorName = "Cx486SLC \\ DLC \\ Cx486S A-Step";
break; break;
case Sun:
case IBM:
case Motorola:
case HP:
case UnknownManufacturer:
default: default:
this->ChipID.ProcessorName = "Unknown family"; // We cannot identify the processor. this->ChipID.ProcessorName = "Unknown family"; // We cannot identify the processor.
return false; return false;

4
Source/kwsys/testHashSTL.cxx
View File

@ -34,7 +34,7 @@
template class kwsys::hash_map<const char*, int>; template class kwsys::hash_map<const char*, int>;
template class kwsys::hash_set<int>; template class kwsys::hash_set<int>;
bool test_hash_map() static bool test_hash_map()
{ {
typedef kwsys::hash_map<const char*, int> mtype; typedef kwsys::hash_map<const char*, int> mtype;
mtype m; mtype m;
@ -51,7 +51,7 @@ bool test_hash_map()
return sum == 3; return sum == 3;
} }
bool test_hash_set() static bool test_hash_set()
{ {
typedef kwsys::hash_set<int> stype; typedef kwsys::hash_set<int> stype;
stype s; stype s;