summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Wüger <roman.wueger@gmx.at>2015-03-13 09:18:19 +0100
committerBrad King <brad.king@kitware.com>2015-03-17 13:46:43 -0400
commitf9d09626899a8196a2f46992585ddff21fd2de34 (patch)
tree8852dc306c31d35487e6d66f944234dca6d9ace3
parenta5cab2e7391df8d2072f1083c075a69bc746c7aa (diff)
downloadcmake-f9d09626899a8196a2f46992585ddff21fd2de34.tar.gz
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.
-rw-r--r--Modules/WriteCompilerDetectionHeader.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index d18f47cae0..f4dcb2157e 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()