Merge topic 'cm_nullptr'

0039ffa2 use CM_NULLPTR

4 files changed, 12 insertions, 10 deletions

diff --git a/Source/cmFilePathUuid.h b/Source/cmFilePathUuid.h
index 87cfcf8..b54dc47 100644
--- a/Source/cmFilePathUuid.h
+++ b/Source/cmFilePathUuid.h
@@ -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,
diff --git a/Source/cmXMLParser.cxx b/Source/cmXMLParser.cxx
index 7c53a3d..9878912 100644
--- a/Source/cmXMLParser.cxx
+++ b/Source/cmXMLParser.cxx
@@ -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)
diff --git a/Tests/CMakeLib/run_compile_commands.cxx b/Tests/CMakeLib/run_compile_commands.cxx
index 529c830..0bf0a7c 100644
--- a/Tests/CMakeLib/run_compile_commands.cxx
+++ b/Tests/CMakeLib/run_compile_commands.cxx
@@ -148,7 +148,8 @@ int main()
        it != end; ++it) {
     std::vector<std::string> command;
     cmSystemTools::ParseUnixCommandLine(it->at("command").c_str(), command);
-    if (!cmSystemTools::RunSingleCommand(command, 0, 0, 0,
+    if (!cmSystemTools::RunSingleCommand(command, CM_NULLPTR, CM_NULLPTR,
+                                         CM_NULLPTR,
                                          it->at("directory").c_str())) {
       std::cout << "ERROR: Failed to run command \"" << command[0] << "\""
                 << std::endl;
diff --git a/Tests/CMakeLib/testXMLSafe.cxx b/Tests/CMakeLib/testXMLSafe.cxx
index 356880c..c4aaf17 100644
--- a/Tests/CMakeLib/testXMLSafe.cxx
+++ b/Tests/CMakeLib/testXMLSafe.cxx
@@ -27,7 +27,7 @@ static test_pair const pairs[] = {
   { "angles <>", "angles &lt;&gt;" },
   { "ampersand &", "ampersand &amp;" },
   { "bad-byte \x80", "bad-byte [NON-UTF-8-BYTE-0x80]" },
-  { 0, 0 }
+  { CM_NULLPTR, CM_NULLPTR }
 };
 
 int testXMLSafe(int /*unused*/, char* /*unused*/ [])