Merge topic 'cxx11-nullptr'

5962db43 Use C++11 nullptr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1175

1 files changed, 19 insertions, 20 deletions

diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index e163c91..a116aa1 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -62,34 +62,34 @@ public:
    *  set to false, will disable furthur messages (cancel).
    */
   static void SetMessageCallback(MessageCallback f,
-                                 void* clientData = CM_NULLPTR);
+                                 void* clientData = nullptr);
 
   /**
    * Display an error message.
    */
-  static void Error(const char* m, const char* m2 = CM_NULLPTR,
-                    const char* m3 = CM_NULLPTR, const char* m4 = CM_NULLPTR);
+  static void Error(const char* m, const char* m2 = nullptr,
+                    const char* m3 = nullptr, const char* m4 = nullptr);
 
   /**
    * Display a message.
    */
-  static void Message(const char* m, const char* title = CM_NULLPTR);
+  static void Message(const char* m, const char* title = nullptr);
 
   typedef void (*OutputCallback)(const char*, size_t length, void*);
 
   ///! Send a string to stdout
   static void Stdout(const char* s);
   static void Stdout(const char* s, size_t length);
-  static void SetStdoutCallback(OutputCallback, void* clientData = CM_NULLPTR);
+  static void SetStdoutCallback(OutputCallback, void* clientData = nullptr);
 
   ///! Send a string to stderr
   static void Stderr(const char* s);
   static void Stderr(const char* s, size_t length);
-  static void SetStderrCallback(OutputCallback, void* clientData = CM_NULLPTR);
+  static void SetStderrCallback(OutputCallback, void* clientData = nullptr);
 
   typedef bool (*InterruptCallback)(void*);
   static void SetInterruptCallback(InterruptCallback f,
-                                   void* clientData = CM_NULLPTR);
+                                   void* clientData = nullptr);
   static bool GetInterruptFlag();
 
   ///! Return true if there was an error at any point.
@@ -220,10 +220,10 @@ public:
     OUTPUT_PASSTHROUGH
   };
   static bool RunSingleCommand(const char* command,
-                               std::string* captureStdOut = CM_NULLPTR,
-                               std::string* captureStdErr = CM_NULLPTR,
-                               int* retVal = CM_NULLPTR,
-                               const char* dir = CM_NULLPTR,
+                               std::string* captureStdOut = nullptr,
+                               std::string* captureStdErr = nullptr,
+                               int* retVal = nullptr,
+                               const char* dir = nullptr,
                                OutputOption outputflag = OUTPUT_MERGE,
                                double timeout = 0.0);
   /**
@@ -232,10 +232,10 @@ public:
    * be in comand[1]...command[command.size()]
    */
   static bool RunSingleCommand(std::vector<std::string> const& command,
-                               std::string* captureStdOut = CM_NULLPTR,
-                               std::string* captureStdErr = CM_NULLPTR,
-                               int* retVal = CM_NULLPTR,
-                               const char* dir = CM_NULLPTR,
+                               std::string* captureStdOut = nullptr,
+                               std::string* captureStdErr = nullptr,
+                               int* retVal = nullptr,
+                               const char* dir = nullptr,
                                OutputOption outputflag = OUTPUT_MERGE,
                                double timeout = 0.0,
                                Encoding encoding = cmProcessOutput::Auto);
@@ -463,13 +463,12 @@ public:
   /** Try to set the RPATH in an ELF binary.  */
   static bool ChangeRPath(std::string const& file, std::string const& oldRPath,
                           std::string const& newRPath,
-                          std::string* emsg = CM_NULLPTR,
-                          bool* changed = CM_NULLPTR);
+                          std::string* emsg = nullptr,
+                          bool* changed = nullptr);
 
   /** Try to remove the RPATH from an ELF binary.  */
-  static bool RemoveRPath(std::string const& file,
-                          std::string* emsg = CM_NULLPTR,
-                          bool* removed = CM_NULLPTR);
+  static bool RemoveRPath(std::string const& file, std::string* emsg = nullptr,
+                          bool* removed = nullptr);
 
   /** Check whether the RPATH in an ELF binary contains the path
       given.  */