mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-25 07:58:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cm_nullptr'

Browse Source 
0039ffa2 use CM_NULLPTR
This commit is contained in:
Brad King
2016-09-06 08:50:53 -04:00
committed by CMake Topic Stage
parent 933fc4ac47 0039ffa216
commit eb226b366f
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmFilePathUuid.h
View File

@@ -52,8 +52,9 @@ public:
* @arg outputPrefix optional string to prepend to the result
* @arg outputSuffix optional string to append to the result
*/
std::string get(const std::string& filePath, const char* outputPrefix = NULL,
const char* outputSuffix = NULL);
std::string get(const std::string& filePath,
const char* outputPrefix = CM_NULLPTR,
const char* outputSuffix = CM_NULLPTR);
private:
void initParentDirs(const std::string& currentSrcDir,

12
Source/cmXMLParser.cxx
View File

@@ -20,10 +20,10 @@
cmXMLParser::cmXMLParser()
{
this->Parser = 0;
this->Parser = CM_NULLPTR;
this->ParseError = 0;
this->ReportCallback = 0;
this->ReportCallbackData = 0;
this->ReportCallback = CM_NULLPTR;
this->ReportCallbackData = CM_NULLPTR;
}
cmXMLParser::~cmXMLParser()
@@ -64,7 +64,7 @@ int cmXMLParser::InitializeParser()
}
// Create the expat XML parser.
this->Parser = XML_ParserCreate(0);
this->Parser = XML_ParserCreate(CM_NULLPTR);
XML_SetElementHandler(static_cast<XML_Parser>(this->Parser),
&cmXMLParserStartElement, &cmXMLParserEndElement);
XML_SetCharacterDataHandler(static_cast<XML_Parser>(this->Parser),
@@ -108,7 +108,7 @@ int cmXMLParser::CleanupParser()
// Clean up the parser.
XML_ParserFree(static_cast<XML_Parser>(this->Parser));
this->Parser = 0;
this->Parser = CM_NULLPTR;
return result;
}
@@ -165,7 +165,7 @@ const char* cmXMLParser::FindAttribute(const char** atts,
}
}
}
return 0;
return CM_NULLPTR;
}
void cmXMLParserStartElement(void* parser, const char* name, const char** atts)