[Cmake-commits] CMake branch, next, updated. v3.2.0-1007-g6a6face

[Brad King]

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  6a6face475ced78e5fa599eceecf7f59974bf6bb (commit)
       via  e433223d1ef9d3cba35a610d9ecd483cd99e39fe (commit)
       via  9a427f86199913d6674d09a66d97d761c38c77c7 (commit)
       via  80e8e7e9561afbc0e621fedab99b96177061ed93 (commit)
      from  b94fa03c9363908624585311954eeca0c209c3d7 (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=6a6face475ced78e5fa599eceecf7f59974bf6bb
commit 6a6face475ced78e5fa599eceecf7f59974bf6bb
Merge: b94fa03 e433223
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 11 08:54:29 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 11 08:54:29 2015 -0400

    Merge topic 'update-kwsys' into next
    
    e433223d Merge branch 'upstream-kwsys' into update-kwsys
    9a427f86 KWSys 2015-03-10 (4a698414)
    80e8e7e9 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e433223d1ef9d3cba35a610d9ecd483cd99e39fe
commit e433223d1ef9d3cba35a610d9ecd483cd99e39fe
Merge: 80e8e7e 9a427f8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 11 08:41:16 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 11 08:41:16 2015 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a427f86199913d6674d09a66d97d761c38c77c7
commit 9a427f86199913d6674d09a66d97d761c38c77c7
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Tue Mar 10 14:16:53 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 11 08:41:11 2015 -0400

    KWSys 2015-03-10 (4a698414)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 4a698414 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 4890f30c..4a698414
    Brad King (1):
          4a698414 hashtable: Give prime number table functions internal linkage
    
    Change-Id: I9f06cdf8c8b5fbe7e1f07afbcc77457f5ee6445f

diff --git a/hashtable.hxx.in b/hashtable.hxx.in
index b93e9be..7e7dc42 100644
--- a/hashtable.hxx.in
+++ b/hashtable.hxx.in
@@ -408,7 +408,7 @@ enum { _stl_num_primes = 31 };
 
 // create a function with a static local to that function that returns
 // the static
-inline const unsigned long* get_stl_prime_list() {
+static inline const unsigned long* get_stl_prime_list() {
 
 static const unsigned long _stl_prime_list[_stl_num_primes] =
 {
@@ -423,7 +423,7 @@ static const unsigned long _stl_prime_list[_stl_num_primes] =
 
 return &_stl_prime_list[0]; }
 
-inline size_t _stl_next_prime(size_t __n)
+static inline size_t _stl_next_prime(size_t __n)
 {
   const unsigned long* __first = get_stl_prime_list();
   const unsigned long* __last = get_stl_prime_list() + (int)_stl_num_primes;

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake     |    2 +-
 Source/kwsys/hashtable.hxx.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake