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
This commit is contained in:
parent
9a427f8619
commit
bc67dbede9
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue