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/cmListFileCache.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/cmListFileCache.cxx')
| -rw-r--r-- | Source/cmListFileCache.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index 0c73cd7..69c4e0d 100644 --- a/Source/cmListFileCache.cxx +++ b/Source/cmListFileCache.cxx @@ -82,7 +82,7 @@ bool cmListFileParser::ParseFile() } if (bom == cmListFileLexer_BOM_Broken) { - cmListFileLexer_SetFileName(this->Lexer, CM_NULLPTR, CM_NULLPTR); + cmListFileLexer_SetFileName(this->Lexer, nullptr, nullptr); this->IssueFileOpenError("Error while reading Byte-Order-Mark. " "File not seekable?"); return false; @@ -90,7 +90,7 @@ bool cmListFileParser::ParseFile() // Verify the Byte-Order-Mark, if any. if (bom != cmListFileLexer_BOM_None && bom != cmListFileLexer_BOM_UTF8) { - cmListFileLexer_SetFileName(this->Lexer, CM_NULLPTR, CM_NULLPTR); + cmListFileLexer_SetFileName(this->Lexer, nullptr, nullptr); this->IssueFileOpenError( "File starts with a Byte-Order-Mark that is not UTF-8."); return false; @@ -330,13 +330,13 @@ cmListFileBacktrace::cmListFileBacktrace(cmStateSnapshot const& bottom, cmListFileBacktrace::cmListFileBacktrace() : Bottom() - , Cur(CM_NULLPTR) + , Cur(nullptr) { } cmListFileBacktrace::cmListFileBacktrace(cmStateSnapshot const& snapshot) : Bottom(snapshot.GetCallStackBottom()) - , Cur(CM_NULLPTR) + , Cur(nullptr) { } |