diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-18 12:58:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-03-18 12:58:11 (GMT) |
| commit | 0e8325db66c3be268321aa7b274fbcd9109174b3 (patch) | |
| tree | f8798c46127a5a112b4ca128537ed60461ed4a7b | |
| parent | a5cab2e7391df8d2072f1083c075a69bc746c7aa (diff) | |
| parent | bc67dbede991be9238e8a102bfb026054b48d83d (diff) | |
| download | CMake-0e8325db66c3be268321aa7b274fbcd9109174b3.zip CMake-0e8325db66c3be268321aa7b274fbcd9109174b3.tar.gz CMake-0e8325db66c3be268321aa7b274fbcd9109174b3.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 8 | ||||
| -rw-r--r-- | Source/kwsys/testHashSTL.cxx | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 9c7ceee..b0434f4 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -1234,6 +1234,7 @@ void StacktraceSignalHandler( case ILL_ILLTRP: oss << "illegal trap"; + break; case ILL_PRVOPC: oss << "privileged opcode"; @@ -1823,6 +1824,7 @@ const char * SystemInformationImplementation::GetVendorID() return "Motorola"; case HP: return "Hewlett-Packard"; + case UnknownManufacturer: default: return "Unknown Manufacturer"; } @@ -3064,6 +3066,12 @@ bool SystemInformationImplementation::RetrieveClassicalCPUIdentity() case NSC: this->ChipID.ProcessorName = "Cx486SLC \\ DLC \\ Cx486S A-Step"; break; + + case Sun: + case IBM: + case Motorola: + case HP: + case UnknownManufacturer: default: this->ChipID.ProcessorName = "Unknown family"; // We cannot identify the processor. return false; diff --git a/Source/kwsys/testHashSTL.cxx b/Source/kwsys/testHashSTL.cxx index b861a5b..ac5cf74 100644 --- a/Source/kwsys/testHashSTL.cxx +++ b/Source/kwsys/testHashSTL.cxx @@ -34,7 +34,7 @@ template class kwsys::hash_map<const char*, int>; template class kwsys::hash_set<int>; -bool test_hash_map() +static bool test_hash_map() { typedef kwsys::hash_map<const char*, int> mtype; mtype m; @@ -51,7 +51,7 @@ bool test_hash_map() return sum == 3; } -bool test_hash_set() +static bool test_hash_set() { typedef kwsys::hash_set<int> stype; stype s; |