summaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-08-25 15:25:40 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-08-25 15:26:24 (GMT)
commitebe436eb97bf81704a1d0b074b3da4ac817f37d3 (patch)
treeae29917c18a9ef90b62da4f616fbf2e8e702fb68 /bootstrap
parent53305ce5b067c4feaa91ffe0cc82b740af525b3f (diff)
parent5962db438939ef2754509b8578af1f845ec07dc8 (diff)
downloadCMake-ebe436eb97bf81704a1d0b074b3da4ac817f37d3.zip
CMake-ebe436eb97bf81704a1d0b074b3da4ac817f37d3.tar.gz
CMake-ebe436eb97bf81704a1d0b074b3da4ac817f37d3.tar.bz2
Merge topic 'cxx11-nullptr'
5962db43 Use C++11 nullptr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1175
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap1
1 files changed, 0 insertions, 1 deletions
diff --git a/bootstrap b/bootstrap
index 378d92e..ba33195 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1203,7 +1203,6 @@ cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"/bootstrap-not-insal
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP"
cmake_report cmConfigure.h${_tmp} "#define CM_EQ_DELETE"
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
-cmake_report cmConfigure.h${_tmp} "#define CM_NULLPTR 0"
cmake_report cmConfigure.h${_tmp} "#define CM_OVERRIDE"
cmake_report cmConfigure.h${_tmp} "#define CM_DISABLE_COPY(Class)"