summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestVC.h
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 /Source/CTest/cmCTestVC.h
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 'Source/CTest/cmCTestVC.h')
-rw-r--r--Source/CTest/cmCTestVC.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestVC.h b/Source/CTest/cmCTestVC.h
index 6400bcd..e04cb48 100644
--- a/Source/CTest/cmCTestVC.h
+++ b/Source/CTest/cmCTestVC.h
@@ -100,8 +100,8 @@ protected:
Revision const* PriorRev;
File()
: Status(PathUpdated)
- , Rev(CM_NULLPTR)
- , PriorRev(CM_NULLPTR)
+ , Rev(nullptr)
+ , PriorRev(nullptr)
{
}
File(PathStatus status, Revision const* rev, Revision const* priorRev)
@@ -117,12 +117,12 @@ protected:
/** Run a command line and send output to given parsers. */
bool RunChild(char const* const* cmd, OutputParser* out, OutputParser* err,
- const char* workDir = CM_NULLPTR,
+ const char* workDir = nullptr,
Encoding encoding = cmProcessOutput::Auto);
/** Run VC update command line and send output to given parsers. */
bool RunUpdateCommand(char const* const* cmd, OutputParser* out,
- OutputParser* err = CM_NULLPTR,
+ OutputParser* err = nullptr,
Encoding encoding = cmProcessOutput::Auto);
/** Write xml element for one file. */