diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-22 21:42:36 (GMT) |
---|---|---|
committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-24 21:39:47 (GMT) |
commit | 5962db438939ef2754509b8578af1f845ec07dc8 (patch) | |
tree | f6b0c0db2acc8dc889d2d5d46fdf75659daa17e7 /Source/cmDependsJavaParserHelper.cxx | |
parent | fe19fda2aa2595622c463fccaa8b36a91e4521c4 (diff) | |
download | CMake-5962db438939ef2754509b8578af1f845ec07dc8.zip CMake-5962db438939ef2754509b8578af1f845ec07dc8.tar.gz CMake-5962db438939ef2754509b8578af1f845ec07dc8.tar.bz2 |
Use C++11 nullptr
Diffstat (limited to 'Source/cmDependsJavaParserHelper.cxx')
-rw-r--r-- | Source/cmDependsJavaParserHelper.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmDependsJavaParserHelper.cxx b/Source/cmDependsJavaParserHelper.cxx index 7bc91bf..179c44a 100644 --- a/Source/cmDependsJavaParserHelper.cxx +++ b/Source/cmDependsJavaParserHelper.cxx @@ -57,7 +57,7 @@ void cmDependsJavaParserHelper::DeallocateParserType(char** pt) if (!*pt) { return; } - *pt = CM_NULLPTR; + *pt = nullptr; this->UnionsAvailable--; } @@ -158,13 +158,13 @@ void cmDependsJavaParserHelper::PrepareElement( cmDependsJavaParserHelper::ParserType* me) { // Inititalize self - me->str = CM_NULLPTR; + me->str = nullptr; } void cmDependsJavaParserHelper::AllocateParserType( cmDependsJavaParserHelper::ParserType* pt, const char* str, int len) { - pt->str = CM_NULLPTR; + pt->str = nullptr; if (len == 0) { len = (int)strlen(str); } @@ -224,7 +224,7 @@ std::vector<std::string> cmDependsJavaParserHelper::GetFilesProduced() std::vector<CurrentClass>::const_iterator it; for (it = toplevel.NestedClasses.begin(); it != toplevel.NestedClasses.end(); ++it) { - it->AddFileNamesForPrinting(&files, CM_NULLPTR, "$"); + it->AddFileNamesForPrinting(&files, nullptr, "$"); } return files; } @@ -324,7 +324,7 @@ void cmDependsJavaParserHelper::Error(const char* str) void cmDependsJavaParserHelper::UpdateCombine(const char* str1, const char* str2) { - if (this->CurrentCombine == "" && str1 != CM_NULLPTR) { + if (this->CurrentCombine == "" && str1 != nullptr) { this->CurrentCombine = str1; } this->CurrentCombine += "."; |