diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-25 15:25:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-25 15:26:24 (GMT) |
| commit | ebe436eb97bf81704a1d0b074b3da4ac817f37d3 (patch) | |
| tree | ae29917c18a9ef90b62da4f616fbf2e8e702fb68 /Source/cmTimestamp.cxx | |
| parent | 53305ce5b067c4feaa91ffe0cc82b740af525b3f (diff) | |
| parent | 5962db438939ef2754509b8578af1f845ec07dc8 (diff) | |
| download | CMake-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/cmTimestamp.cxx')
| -rw-r--r-- | Source/cmTimestamp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 4b97188..ad08444 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -12,7 +12,7 @@ std::string cmTimestamp::CurrentTime(const std::string& formatString, bool utcFlag) { - time_t currentTimeT = time(CM_NULLPTR); + time_t currentTimeT = time(nullptr); std::string source_date_epoch; cmSystemTools::GetEnv("SOURCE_DATE_EPOCH", source_date_epoch); if (!source_date_epoch.empty()) { @@ -56,14 +56,14 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, struct tm timeStruct; memset(&timeStruct, 0, sizeof(timeStruct)); - struct tm* ptr = (struct tm*)CM_NULLPTR; + struct tm* ptr = (struct tm*)nullptr; if (utcFlag) { ptr = gmtime(&timeT); } else { ptr = localtime(&timeT); } - if (ptr == CM_NULLPTR) { + if (ptr == nullptr) { return std::string(); } |