diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-20 13:47:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-20 13:47:37 (GMT) |
| commit | 543b20f269df537f3cde6cee1dfaeab6dd31e942 (patch) | |
| tree | 086de1d2b62a420aff3493d0d37569e06a8d4405 /Modules | |
| parent | 1b1144b91dcaae05a0caffd3d238e76268600af7 (diff) | |
| parent | f9d09626899a8196a2f46992585ddff21fd2de34 (diff) | |
| download | CMake-543b20f269df537f3cde6cee1dfaeab6dd31e942.zip CMake-543b20f269df537f3cde6cee1dfaeab6dd31e942.tar.gz CMake-543b20f269df537f3cde6cee1dfaeab6dd31e942.tar.bz2 | |
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.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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() |