mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-05 21:31:08 -06:00
use CM_NULLPTR
This commit is contained in:
committed by
Brad King
parent
b4b73f56a2
commit
1d6909a287
@@ -161,7 +161,7 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args,
|
||||
return false;
|
||||
} else {
|
||||
// Add the null terminating pointer to the command argument list.
|
||||
cmds[i].push_back(0);
|
||||
cmds[i].push_back(CM_NULLPTR);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -228,7 +228,7 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args,
|
||||
int length;
|
||||
char* data;
|
||||
int p;
|
||||
while ((p = cmsysProcess_WaitForData(cp, &data, &length, 0), p)) {
|
||||
while ((p = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR), p)) {
|
||||
// Put the output in the right place.
|
||||
if (p == cmsysProcess_Pipe_STDOUT && !output_quiet) {
|
||||
if (output_variable.empty()) {
|
||||
@@ -246,7 +246,7 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args,
|
||||
}
|
||||
|
||||
// All output has been read. Wait for the process to exit.
|
||||
cmsysProcess_WaitForExit(cp, 0);
|
||||
cmsysProcess_WaitForExit(cp, CM_NULLPTR);
|
||||
|
||||
// Fix the text in the output strings.
|
||||
cmExecuteProcessCommandFixText(tempOutput, output_strip_trailing_whitespace);
|
||||
|
||||
Reference in New Issue
Block a user