[Cmake-commits] CMake branch, next, updated. v3.2.1-1057-g2753adc

[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  2753adca6f98c66733498996b2072073823114bf (commit)
       via  f9d09626899a8196a2f46992585ddff21fd2de34 (commit)
      from  8a82bf6a83fa1d9c3c53cc5373cc793366d6b954 (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=2753adca6f98c66733498996b2072073823114bf
commit 2753adca6f98c66733498996b2072073823114bf
Merge: 8a82bf6 f9d0962
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 17 14:10:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 17 14:10:33 2015 -0400

    Merge topic 'WCDH-fix-cxx_nullptr-workaround' into next
    
    f9d09626 WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9d09626899a8196a2f46992585ddff21fd2de34
commit f9d09626899a8196a2f46992585ddff21fd2de34
Author:     Roman Wüger <roman.wueger at gmx.at>
AuthorDate: Fri Mar 13 09:18:19 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 17 13:46:43 2015 -0400

    WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers
    
    Use just '0' instead of 'static_cast<void*>(0)' because the latter
    will not automatically convert to pointers to other types.

diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index d18f47c..f4dcb21 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -586,7 +586,7 @@ function(write_compiler_detection_header
 #  if ${def_name}
 #    define ${def_value} nullptr
 #  else
-#    define ${def_value} static_cast<void*>(0)
+#    define ${def_value} 0
 #  endif
 \n")
       endif()

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

Summary of changes:
 Modules/WriteCompilerDetectionHeader.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake