diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2015-03-18 12:55:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-03-18 12:58:08 (GMT) |
| commit | bc67dbede991be9238e8a102bfb026054b48d83d (patch) | |
| tree | b6e4afee6a093a67a73361ed45c601d55dd8c12a | |
| parent | 9a427f86199913d6674d09a66d97d761c38c77c7 (diff) | |
| download | CMake-bc67dbede991be9238e8a102bfb026054b48d83d.zip CMake-bc67dbede991be9238e8a102bfb026054b48d83d.tar.gz CMake-bc67dbede991be9238e8a102bfb026054b48d83d.tar.bz2 | |
KWSys 2015-03-18 (9367a33b)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 9367a33b | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 4a698414..9367a33b
Brad King (1):
20f50727 SystemInformation: Add missing 'break' in StacktraceSignalHandler
Sean McBride (2):
093eae34 SystemInformation: Fix -Wswitch-enum warnings
9367a33b testHashSTL: Fix warnings by marking private functions static
Change-Id: Ia4ba110c901698f08797412da5773abf4c4c5330
| -rw-r--r-- | SystemInformation.cxx | 8 | ||||
| -rw-r--r-- | testHashSTL.cxx | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/SystemInformation.cxx b/SystemInformation.cxx index 9c7ceee..b0434f4 100644 --- a/SystemInformation.cxx +++ b/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/testHashSTL.cxx b/testHashSTL.cxx index b861a5b..ac5cf74 100644 --- a/testHashSTL.cxx +++ b/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; |