summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-03-20 09:47:37 -0400
committerCMake Topic Stage <kwrobot@kitware.com>2015-03-20 09:47:37 -0400
commit543b20f269df537f3cde6cee1dfaeab6dd31e942 (patch)
tree086de1d2b62a420aff3493d0d37569e06a8d4405 /Modules
parent1b1144b91dcaae05a0caffd3d238e76268600af7 (diff)
parentf9d09626899a8196a2f46992585ddff21fd2de34 (diff)
downloadcmake-543b20f269df537f3cde6cee1dfaeab6dd31e942.tar.gz
Merge topic 'WCDH-fix-cxx_nullptr-workaround'
f9d09626 WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers
Diffstat (limited to 'Modules')
-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()