diff options
author | Brad King <brad.king@kitware.com> | 2017-08-25 15:25:40 +0000 |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-25 11:26:24 -0400 |
commit | ebe436eb97bf81704a1d0b074b3da4ac817f37d3 (patch) | |
tree | ae29917c18a9ef90b62da4f616fbf2e8e702fb68 /Source/cmake.h | |
parent | 53305ce5b067c4feaa91ffe0cc82b740af525b3f (diff) | |
parent | 5962db438939ef2754509b8578af1f845ec07dc8 (diff) | |
download | cmake-ebe436eb97bf81704a1d0b074b3da4ac817f37d3.tar.gz |
Merge topic 'cxx11-nullptr'
5962db43 Use C++11 nullptr
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1175
Diffstat (limited to 'Source/cmake.h')
-rw-r--r-- | Source/cmake.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmake.h b/Source/cmake.h index 4ddacf7011..c5d5b63a27 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -268,8 +268,7 @@ public: * number provided may be negative in cases where a message is * to be displayed without any progress percentage. */ - void SetProgressCallback(ProgressCallbackType f, - void* clientData = CM_NULLPTR); + void SetProgressCallback(ProgressCallbackType f, void* clientData = nullptr); ///! this is called by generators to update the progress void UpdateProgress(const char* msg, float prog); |