This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 915508ce92ea902def48ba166021e9ca4fb228bf (commit)
via 0e8325db66c3be268321aa7b274fbcd9109174b3 (commit)
via bc67dbede991be9238e8a102bfb026054b48d83d (commit)
from 3eb856c1332775686b6003ba2c05c033dbd7ac47 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=915508ce92ea902def48ba166021e9ca4fb228bf
commit 915508ce92ea902def48ba166021e9ca4fb228bf
Merge: 3eb856c 0e8325d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 18 08:59:55 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Mar 18 08:59:55 2015 -0400
Merge topic 'update-kwsys' into next
0e8325db Merge branch 'upstream-kwsys' into update-kwsys
bc67dbed KWSys 2015-03-18 (9367a33b)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e8325db66c3be268321aa7b274fbcd9109174b3
commit 0e8325db66c3be268321aa7b274fbcd9109174b3
Merge: a5cab2e bc67dbe
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 18 08:58:11 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Mar 18 08:58:11 2015 -0400
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc67dbede991be9238e8a102bfb026054b48d83d
commit bc67dbede991be9238e8a102bfb026054b48d83d
Author: KWSys Robot <kwro...@kitware.com>
AuthorDate: Wed Mar 18 08:55:32 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Mar 18 08:58:08 2015 -0400
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
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;
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/SystemInformation.cxx | 8 ++++++++
Source/kwsys/testHashSTL.cxx | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
