summaryrefslogtreecommitdiffstats
path: root/Source/cmProcessOutput.cxx
diff options
context:
space:
mode:
authorscivision <scivision@users.noreply.github.com>2023-02-14 19:06:08 (GMT)
committerscivision <scivision@users.noreply.github.com>2023-02-14 19:34:03 (GMT)
commit7b0a629693bb3771eed9d922b8138ccc6e5ae0c2 (patch)
treecec26df2a6554f9a7031646931dfb1ec6f70912b /Source/cmProcessOutput.cxx
parent283432a1aaa72cd0dc5c0bd0e301bccfd52edd01 (diff)
downloadCMake-7b0a629693bb3771eed9d922b8138ccc6e5ae0c2.zip
CMake-7b0a629693bb3771eed9d922b8138ccc6e5ae0c2.tar.gz
CMake-7b0a629693bb3771eed9d922b8138ccc6e5ae0c2.tar.bz2
Source: use C++11 nullptr
Diffstat (limited to 'Source/cmProcessOutput.cxx')
-rw-r--r--Source/cmProcessOutput.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmProcessOutput.cxx b/Source/cmProcessOutput.cxx
index 10c4215..e1df661 100644
--- a/Source/cmProcessOutput.cxx
+++ b/Source/cmProcessOutput.cxx
@@ -85,7 +85,7 @@ bool cmProcessOutput::DecodeText(std::string raw, std::string& decoded,
rawparts[id - 1] += *(raw.end() - 1);
raw.resize(raw.size() - 1);
}
- success = DoDecodeText(raw, decoded, NULL);
+ success = DoDecodeText(raw, decoded, nullptr);
} else {
bool restoreDecoded = false;
std::string firstDecoded = decoded;
@@ -114,7 +114,7 @@ bool cmProcessOutput::DecodeText(std::string raw, std::string& decoded,
}
}
} else {
- success = DoDecodeText(raw, decoded, NULL);
+ success = DoDecodeText(raw, decoded, nullptr);
}
}
return success;
@@ -143,7 +143,7 @@ bool cmProcessOutput::DoDecodeText(std::string raw, std::string& decoded,
{
bool success = false;
const int wlength =
- MultiByteToWideChar(codepage, 0, raw.c_str(), int(raw.size()), NULL, 0);
+ MultiByteToWideChar(codepage, 0, raw.c_str(), int(raw.size()), nullptr, 0);
auto wdata = cm::make_unique<wchar_t[]>(wlength);
int r = MultiByteToWideChar(codepage, 0, raw.c_str(), int(raw.size()),
wdata.get(), wlength);
@@ -156,10 +156,10 @@ bool cmProcessOutput::DoDecodeText(std::string raw, std::string& decoded,
}
}
int length = WideCharToMultiByte(defaultCodepage, 0, wdata.get(), wlength,
- NULL, 0, NULL, NULL);
+ nullptr, 0, nullptr, nullptr);
auto data = cm::make_unique<char[]>(length);
r = WideCharToMultiByte(defaultCodepage, 0, wdata.get(), wlength,
- data.get(), length, NULL, NULL);
+ data.get(), length, nullptr, nullptr);
if (r > 0) {
decoded = std::string(data.get(), length);
success = true;