[Cmake-commits] CMake branch, next, updated. v2.8.8-3023-gb053b57

[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  b053b57998a4338a4b61a0414925e4a76ef76bde (commit)
       via  4f170e25752c995d8c51391cea60d86b549ea150 (commit)
      from  8d1eec54db1d4180616411ab47d0298bcedb5483 (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=b053b57998a4338a4b61a0414925e4a76ef76bde
commit b053b57998a4338a4b61a0414925e4a76ef76bde
Merge: 8d1eec5 4f170e2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 5 16:24:01 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 5 16:24:01 2012 -0400

    Merge topic 'KWSys-hashtable-old-gcc' into next
    
    4f170e2 KWSys: Fix hashtable prime list on g++ 2.9 (#13273)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f170e25752c995d8c51391cea60d86b549ea150
commit 4f170e25752c995d8c51391cea60d86b549ea150
Author:     Daniel R. Gomez <gomez at teragram.com>
AuthorDate: Tue Jun 5 16:19:06 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 5 16:23:09 2012 -0400

    KWSys: Fix hashtable prime list on g++ 2.9 (#13273)
    
    Building CMake with g++ 2.9-aix51-020209 on an AIX 5.3 system gives:
    
     cmsys/hashtable.hxx: In function `const long unsigned int *cmsys::get_stl_prime_list ()':
     cmsys/hashtable.hxx:399: warning: sorry: semantics of inline function static data
      `const long unsigned int _stl_prime_list[31]' are wrong (you'll wind up with multiple copies)
     cmsys/hashtable.hxx:399: warning: you can work around this by removing the initializer
    
    Give get_stl_prime_list internal linkage.

diff --git a/Source/kwsys/hashtable.hxx.in b/Source/kwsys/hashtable.hxx.in
index db52fc8..c835503 100644
--- a/Source/kwsys/hashtable.hxx.in
+++ b/Source/kwsys/hashtable.hxx.in
@@ -394,7 +394,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] =
 {

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

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


hooks/post-receive
-- 
CMake