[Cmake-commits] CMake branch, next, updated. v3.6.1-1790-g8752d76

[Daniel Pfeifer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8752d765ae63edd5153a0547727989a4efe4d809 (commit)
       via  0039ffa2163665856be1e772146442f2c7418c6c (commit)
      from  425a1248b7c91f3bd1d2a4facbfca2b7889878a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8752d765ae63edd5153a0547727989a4efe4d809
commit 8752d765ae63edd5153a0547727989a4efe4d809
Merge: 425a124 0039ffa
Author:     Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Mon Sep 5 17:18:34 2016 -0400
Commit:     CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 5 17:18:34 2016 -0400

    Merge topic 'cm_nullptr' into next
    
    0039ffa2 use CM_NULLPTR


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0039ffa2163665856be1e772146442f2c7418c6c
commit 0039ffa2163665856be1e772146442f2c7418c6c
Author:     Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Mon Sep 5 23:18:05 2016 +0200
Commit:     Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Mon Sep 5 23:18:05 2016 +0200

    use CM_NULLPTR

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*/ [])

-----------------------------------------------------------------------

Summary of changes:
 Source/cmFilePathUuid.h                 |    5 +++--
 Source/cmXMLParser.cxx                  |   12 ++++++------
 Tests/CMakeLib/run_compile_commands.cxx |    3 ++-
 Tests/CMakeLib/testXMLSafe.cxx          |    2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits